Max Bernhardt
2018-01-08 13:24:29 UTC
<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div>Hi all,</div> <div> </div> <div>We've just upgraded our subversion server from 1.4.6 to 1.9.7 and now I'm getting a strange merge conflict, when I'm trying to do a reverse merge on a baseline (trunk).</div> <div> </div> <div>The situation is as follows:</div> <div> /project/branches/it/33931/db/data_update.sql <- Branch created from /project/branches/releases/23 in r374471, File added in revision r374494</div> <div> /project/branches/releases/23/db/data_update.sql <- File added via merge of r374471- 374494 of /project/branches/it/33931</div> <div> </div> <div>Now I'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> </div> <div> svn log -v db/data_update.sql</div> <div> r378753 | maxbernhardt | 2018-01-04 15:06:11 +0100 (Do, 04 Jan 2018) | 7 lines</div> <div> Changed paths:</div> <div> M /project/branches/releases/23/db</div> <div> A / project/branches/releases/23/db/data_upgrade.sql (from /project/branches/it/33931/db/data_upgrade.sql:374494)</div> <div> Prodbuild: Committing svn://pbsvn/project/branches/it/33931</div> <div> </div> <div> svn info</div> <div> Path: .</div> <div> Working Copy Root Path: /home/cmi/wc/project/23</div> <div> URL: svn://pbsvn/project/branches/releases/23</div> <div> Repository Root: svn://pbsvn Revision: 379041</div> <div> </div> <div> svn merge -c-374494 svn://pbsvn/project/branches/releases/23 .</div> <div> --- Reverse-merging r374494 into '.':</div> <div> C update_data.sql</div> <div> --- Recording mergeinfo for reverse merge of r374494 into '.':</div> <div> G .</div> <div> Summary of conflicts:</div> <div> Tree conflicts: 1</div> <div> </div> <div> svn st</div> <div> M db</div> <div> C db/data_update.sql</div> <div> > local edit, incoming delete upon merge</div> <div> Summary of conflicts:</div> <div> Tree conflicts: 1</div> <div> </div> <div> svn diff db/data_update.sql</div> <div> <Returns nothing, so there are no local changes as far as we know></div>
<div> </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> </div>
<div>I know, I can remove the file manually by running "svn rm", but if there are more complicated merges in the future,</div>
<div>this can only be seen as a workaround.</div>
<div> </div>
<div>Can you please explicitly cc me, because I'm not subscribed to mailing list ?</div>
<div> </div>
<div>Cheers Max</div>
<div> </div></div></body></html>
<div> </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> </div>
<div>I know, I can remove the file manually by running "svn rm", but if there are more complicated merges in the future,</div>
<div>this can only be seen as a workaround.</div>
<div> </div>
<div>Can you please explicitly cc me, because I'm not subscribed to mailing list ?</div>
<div> </div>
<div>Cheers Max</div>
<div> </div></div></body></html>