(no subject)
"Rogers, Ross B" <[email protected]> Tue, 21 Jul 2009 10:47:52 -0700
| Newsgroups | gmane.comp.version-control.bitkeeper.user |
|---|---|
| Message-ID | <B27EBC40D200ED48A3F4CC2EBEABAE0B481F5324@orsmsx501.amr.corp.intel.com> |
This is a multi-part MIME message.
--===============2119996213==
Content-Language: en-US
Content-Type: multipart/alternative;
boundary="=_reb-r77047D9A-t4A65FFF9"
This is a multi-part MIME message.
--=_reb-r77047D9A-t4A65FFF9
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Hi,
Wonder if someone has run into this before.
I'm doing a merge of two branches and having tons of renaming conflicts on =
deleted files from the two branches. Here is a sample of it:
The file has a name conflict of some type.
GCA: design/lgddrbox/design/lgpbox/rtl/lgpcccwckedc.chf (greatest common=
ancestor)
Local: BitKeeper/deleted/.del-lgpcccwckedc.chf pathname is available local=
ly
Remote: BitKeeper/deleted/.del-lgpcccwckedc.chf~f341ad2a412dd498 pathname i=
s available locally
The file is deleted from both branches but get put into the deleted dir wit=
h different name. And the resolve is prompting me the files one by one... h=
ere is the option I can do:
Commands are:
? - print this help
a - abort the patch, DISCARDING all merges
cl - clear the screen
d - diff the local file against the remote file
D - run graphical difftool on local and remote
hl - revision history of the local file
hr - revision history of the remote file
H - run helptool
l - use the local file name
m - move the file to someplace else
p - graphical picture of the file history
q - immediately exit resolve
r - use the remote file name
vl - view the local file
vr - view the remote file
x - explain the choices
and I'm entering "l" to use the local file name for each prompt. But there =
are probably over 10,000 files got deleted, doing it manually is insane. Is=
there a program that can be written so that when one does a "bk pull" it w=
ill take care all the rename conflict if they are deleted files.
- Ross
--=_reb-r77047D9A-t4A65FFF9
Content-Type: text/html; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
<html xmlns=3D"http://www.w3.org/TR/REC-html40" xmlns:st=3D"" xmlns:Z=
=3D"urn:schemas-microsoft-com:" xmlns:spsl=3D"http://microsoft.com/webservi=
ces/SharePointPortalServer/PublishedLinksService" xmlns:pptsl=3D"http://sch=
emas.microsoft.com/sharepoint/soap/SlideLibrary/" xmlns:ex12m=3D"http://sch=
emas.microsoft.com/exchange/services/2006/messages" xmlns:ex12t=3D"http://s=
chemas.microsoft.com/exchange/services/2006/types" xmlns:spwp=3D"http://mic=
rosoft.com/sharepoint/webpartpages" xmlns:mrels=3D"http://schemas.openxmlfo=
rmats.org/package/2006/relationships" xmlns:m=3D"http://schemas.microsoft.c=
om/office/2004/12/omml" xmlns:mver=3D"http://schemas.openxmlformats.org/mar=
kup-compatibility/2006" xmlns:mdssi=3D"http://schemas.openxmlformats.org/pa=
ckage/2006/digital-signature" xmlns:dssi=3D"http://schemas.microsoft.com/of=
fice/2006/digsig" xmlns:dsss=3D"http://schemas.microsoft.com/office/2006/di=
gsig-setup" xmlns:wf=3D"http://schemas.microsoft.com/sharepoint/soap/workfl=
ow/" xmlns:udcp2p=3D"http://schemas.microsoft.com/data/udc/parttopart" xmln=
s:udcxf=3D"http://schemas.microsoft.com/data/udc/xmlfile" xmlns:udcs=3D"htt=
p://schemas.microsoft.com/data/udc/soap" xmlns:xsi=3D"http://www.w3.org/200=
1/XMLSchema-instance" xmlns:sps=3D"http://schemas.microsoft.com/sharepoint/=
soap/" xmlns:sp=3D"http://schemas.microsoft.com/sharepoint/" xmlns:ec=3D"ht=
tp://www.w3.org/2001/04/xmlenc#" xmlns:sub=3D"http://schemas.microsoft.com/=
sharepoint/soap/2002/1/alerts/" xmlns:xsd=3D"http://www.w3.org/2001/XMLSche=
ma" xmlns:udc=3D"http://schemas.microsoft.com/data/udc" xmlns:dsp=3D"http:/=
/schemas.microsoft.com/sharepoint/dsp" xmlns:ds=3D"http://www.w3.org/2000/0=
9/xmldsig#" xmlns:dir=3D"http://schemas.microsoft.com/sharepoint/soap/direc=
tory/" xmlns:ois=3D"http://schemas.microsoft.com/sharepoint/soap/ois/" xmln=
s:ppda=3D"http://www.passport.com/NameSpace.xsd" xmlns:x2=3D"http://schemas=
.microsoft.com/office/excel/2003/xml" xmlns:mt=3D"http://schemas.microsoft.=
com/sharepoint/soap/meetings/" xmlns:Repl=3D"http://schemas.microsoft.com/r=
epl/" xmlns:D=3D"DAV:" xmlns:rtc=3D"http://microsoft.com/officenet/conferen=
cing" xmlns:q=3D"http://schemas.xmlsoap.org/soap/envelope/" xmlns:html=3D"h=
ttp://www.w3.org/TR/REC-html40" xmlns:oa=3D"urn:schemas-microsoft-com:offic=
e:activation" xmlns:odc=3D"urn:schemas-microsoft-com:office:odc" xmlns:c=3D=
"urn:schemas-microsoft-com:office:component:spreadsheet" xmlns:ss=3D"urn:sc=
hemas-microsoft-com:office:spreadsheet" xmlns:b=3D"urn:schemas-microsoft-co=
m:office:publisher" xmlns:z=3D"#RowsetSchema" xmlns:rs=3D"urn:schemas-micro=
soft-com:rowset" xmlns:s=3D"uuid:BDC6E3F0-6DA3-11d1-A2A3-00AA00C14882" xmln=
s:dt=3D"uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:a=3D"urn:schemas-m=
icrosoft-com:office:access" xmlns:p=3D"urn:schemas-microsoft-com:office:pow=
erpoint" xmlns:x=3D"urn:schemas-microsoft-com:office:excel" xmlns:w=3D"urn:=
schemas-microsoft-com:office:word" xmlns:o=3D"urn:schemas-microsoft-com:off=
ice:office" xmlns:v=3D"urn:schemas-microsoft-com:vml">
<head>
<style>
<!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;}
@page Section1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.Section1
{page:Section1;}
-->
</style>
<!--[if gte mso 9]><xml>
<o:shapedefaults v:ext=3D"edit" spidmax=3D"1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext=3D"edit">
<o:idmap v:ext=3D"edit" data=3D"1" />
</o:shapelayout></xml><![endif]-->
</head>
<body vlink=3D"purple" link=3D"blue" lang=3D"EN-US">
<div class=3D"Section1">
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">Hi,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif""><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">Wonder
if someone has run into this before.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">I’m
doing a merge of two branches and having tons of renaming conflicts on dele=
ted
files from the two branches. Here is a sample of it:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif""><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">The
file has a name conflict of some type.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">GCA:
design/lgddrbox/design/lgpbox/rtl/lgpcccwckedc.chf (greatest common ancesto=
r)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">Local:
BitKeeper/deleted/.del-lgpcccwckedc.chf pathname is available locally<o:p><=
/o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">Remote:
BitKeeper/deleted/.del-lgpcccwckedc.chf~f341ad2a412dd498 pathname is availa=
ble
locally<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif""><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">The
file is deleted from both branches but get put into the deleted dir with
different name. And the resolve is prompting me the files one by one…
here is the option I can do:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif""><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">Commands
are:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif""><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
? - print this help<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
a - abort the patch, DISCARDING all merges<o:p></o:p></sp=
an></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
cl - clear the screen<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
d - diff the local file against the remote file<o:p></o:p=
></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
D - run graphical difftool on local and remote<o:p></o:p>=
</span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
hl - revision history of the local file<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
hr - revision history of the remote file<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
H - run helptool<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
l - use the local file name<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
m - move the file to someplace else<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
p - graphical picture of the file history<o:p></o:p></spa=
n></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
q - immediately exit resolve<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
r - use the remote file name<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
vl - view the local file<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
vr - view the remote file<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">
x - explain the choices<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif""><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif"">and
I’m entering “l” to use the local file name for each prom=
pt.
But there are probably over 10,000 files got deleted, doing it manually is
insane. Is there a program that can be written so that when one does a
“bk pull” it will take care all the rename conflict if they are
deleted files.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Calibri=
","sans-serif""><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:11.0pt;font-family:"Calibri=
","sans-serif""><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-size:10.0pt;font-family:"Arial",=
"sans-serif""> -
Ross</span><o:p></o:p></p>
</div>
</body>
</html>
--=_reb-r77047D9A-t4A65FFF9--
--===============2119996213==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
Bitkeeper-users mailing list
[email protected]
http://mail.bitmover.com/mailman/listinfo/bitkeeper-users
--===============2119996213==--