<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:st="" xmlns:Z="urn:schemas-microsoft-com:" xmlns:spsl="http://microsoft.com/webservices/SharePointPortalServer/PublishedLinksService" xmlns:pptsl="http://schemas.microsoft.com/sharepoint/soap/SlideLibrary/" xmlns:ex12m="http://schemas.microsoft.com/exchange/services/2006/messages" xmlns:ex12t="http://schemas.microsoft.com/exchange/services/2006/types" xmlns:spwp="http://microsoft.com/sharepoint/webpartpages" xmlns:mrels="http://schemas.openxmlformats.org/package/2006/relationships" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns:mver="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mdssi="http://schemas.openxmlformats.org/package/2006/digital-signature" xmlns:dssi="http://schemas.microsoft.com/office/2006/digsig" xmlns:dsss="http://schemas.microsoft.com/office/2006/digsig-setup" xmlns:wf="http://schemas.microsoft.com/sharepoint/soap/workflow/" xmlns:udcp2p="http://schemas.microsoft.com/data/udc/parttopart" xmlns:udcxf="http://schemas.microsoft.com/data/udc/xmlfile" xmlns:udcs="http://schemas.microsoft.com/data/udc/soap" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sps="http://schemas.microsoft.com/sharepoint/soap/" xmlns:sp="http://schemas.microsoft.com/sharepoint/" xmlns:ec="http://www.w3.org/2001/04/xmlenc#" xmlns:sub="http://schemas.microsoft.com/sharepoint/soap/2002/1/alerts/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:udc="http://schemas.microsoft.com/data/udc" xmlns:dsp="http://schemas.microsoft.com/sharepoint/dsp" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:dir="http://schemas.microsoft.com/sharepoint/soap/directory/" xmlns:ois="http://schemas.microsoft.com/sharepoint/soap/ois/" xmlns:ppda="http://www.passport.com/NameSpace.xsd" xmlns:x2="http://schemas.microsoft.com/office/excel/2003/xml" xmlns:mt="http://schemas.microsoft.com/sharepoint/soap/meetings/" xmlns:Repl="http://schemas.microsoft.com/repl/" xmlns:D="DAV:" xmlns:rtc="http://microsoft.com/officenet/conferencing" xmlns:q="http://schemas.xmlsoap.org/soap/envelope/" xmlns:html="http://www.w3.org/TR/REC-html40" xmlns:oa="urn:schemas-microsoft-com:office:activation" xmlns:odc="urn:schemas-microsoft-com:office:odc" xmlns:c="urn:schemas-microsoft-com:office:component:spreadsheet" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet" xmlns:b="urn:schemas-microsoft-com:office:publisher" xmlns:z="#RowsetSchema" xmlns:rs="urn:schemas-microsoft-com:rowset" xmlns:s="uuid:BDC6E3F0-6DA3-11d1-A2A3-00AA00C14882" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:a="urn:schemas-microsoft-com:office:access" xmlns:p="urn:schemas-microsoft-com:office:powerpoint" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="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="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body vlink="purple" link="blue" lang="EN-US">
<div class="Section1">
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">Hi,<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif""><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="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="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">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:<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif""><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="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="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">GCA:
design/lgddrbox/design/lgpbox/rtl/lgpcccwckedc.chf (greatest common ancestor)<o:p></o:p></span></p>
<p class="MsoNormal"><span style="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="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">Remote:
BitKeeper/deleted/.del-lgpcccwckedc.chf~f341ad2a412dd498 pathname is available
locally<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif""><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="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="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif""><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">Commands
are:<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif""><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
? - print this help<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
a - abort the patch, DISCARDING all merges<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
cl - clear the screen<o:p></o:p></span></p>
<p class="MsoNormal"><span style="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="MsoNormal"><span style="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="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
hl - revision history of the local file<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
hr - revision history of the remote file<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
H - run helptool<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
l - use the local file name<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
m - move the file to someplace else<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
p - graphical picture of the file history<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
q - immediately exit resolve<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
r - use the remote file name<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
vl - view the local file<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
vr - view the remote file<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">
x - explain the choices<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif""><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif"">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 will take care all the rename conflict if they are
deleted files.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif""><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif""><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Arial","sans-serif""> -
Ross</span><o:p></o:p></p>
</div>
</body>
</html>