subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Max Bernhardt" <Max.Bernha...@gmx.eu>
Subject Question regarding reverse merge of added file
Date Mon, 08 Jan 2018 13:24:29 GMT
<html><head></head><body><div style="font-family: Verdana;font-size:
12.0px;"><div>Hi all,</div>

<div>&nbsp;</div>

<div>We&#39;ve just upgraded our subversion server from 1.4.6 to 1.9.7 and now I&#39;m
getting a strange merge conflict, when I&#39;m trying to do a reverse merge on a baseline
(trunk).</div>

<div>&nbsp;</div>

<div>The situation is as follows:</div>

<div>&nbsp;&nbsp;&nbsp; /project/branches/it/33931/db/data_update.sql&nbsp;&nbsp;&nbsp;&nbsp;
&lt;- Branch created from /project/branches/releases/23 in r374471, File added in revision
r374494</div>

<div>&nbsp;&nbsp;&nbsp; /project/branches/releases/23/db/data_update.sql
&lt;- File added via merge of r374471- 374494 of /project/branches/it/33931</div>

<div>&nbsp;</div>

<div>Now I&#39;ve found out that this merge was wrong and want to reverse it. I
tried to run the reverse merge on the baseline:</div>

<div>&nbsp;</div>

<div>&nbsp;&nbsp;&nbsp; svn log -v db/data_update.sql</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; r378753
&#124; maxbernhardt &#124; 2018-01-04 15:06:11 +0100 (Do, 04 Jan 2018) &#124;
7 lines</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Changed
paths:</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
M /project/branches/releases/23/db</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
A / project/branches/releases/23/db/data_upgrade.sql (from /project/branches/it/33931/db/data_upgrade.sql:374494)</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Prodbuild:
Committing svn://pbsvn/project/branches/it/33931</div>

<div>&nbsp;</div>

<div>&nbsp;&nbsp;&nbsp; svn info</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Path: .</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Working
Copy Root Path: /home/cmi/wc/project/23</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; URL: svn://pbsvn/project/branches/releases/23</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Repository
Root: svn://pbsvn Revision: 379041</div>

<div>&nbsp;</div>

<div>&nbsp;&nbsp;&nbsp; svn merge -c-374494 svn://pbsvn/project/branches/releases/23
.</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --- Reverse-merging
r374494 into &#39;.&#39;:</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
C update_data.sql</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --- Recording
mergeinfo for reverse merge of r374494 into &#39;.&#39;:</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
G .</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Summary of conflicts:</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
Tree conflicts: 1</div>

<div>&nbsp;</div>

<div>&nbsp;&nbsp; svn st</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; M db</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
C db/data_update.sql</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&gt; local edit, incoming delete upon merge</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Summary of conflicts:</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
Tree conflicts: 1</div>

<div>&nbsp;</div>

<div>&nbsp;&nbsp;&nbsp; svn diff db/data_update.sql</div>

<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;Returns
nothing, so there are no local changes as far as we know&gt;</div>

<div>&nbsp;</div>

<div>Since a tree conflict can only be resolved to the state of the working copy and
the file still exists in the working copy of the baseline,</div>

<div>how can I do a reverse merge to remove the file from the baseline without creating
a tree conflict ?</div>

<div>&nbsp;</div>

<div>I know, I can remove the file manually by running &quot;svn rm&quot;, but
if there are more complicated merges in the future,</div>

<div>this can only be seen as a workaround.</div>

<div>&nbsp;</div>

<div>Can you please explicitly cc me, because I&#39;m not subscribed to mailing
list ?</div>

<div>&nbsp;</div>

<div>Cheers Max</div>

<div>&nbsp;</div></div></body></html>

Mime
View raw message