[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1075802 - in /subversion/trunk/subversion: libsvn_client/merge.c libsvn_wc/merge.c tests/cmdline/merge_tests.py

From: Arwin Arni <arwin_at_collab.net>
Date: Fri, 04 Mar 2011 17:01:07 +0530

On Friday 04 March 2011 04:52 PM, Philip Martin wrote:
> Arwin Arni<arwin_at_collab.net> writes:
>
>> Post this fix, I noticed that **merge --dry-run** throws an
>> interactive conflict resolution dialog and create the merge-left and
>> merge-right files.
>
> Does this apply to all files or just binary files?
>
This applies only to binary files. For text files (dry-run), no conflict
resolution dialog, no left/right files..

>> This alters the Working Copy (creating filename.merge-left.rXYZ,
>> filename.merge-right.rABC) without marking a conflict (because it's a
>> dry-run). the test-case attached to the issue, only tests for the
>> executable flag. It doesn't run_and_verify_merge (which would make
>> sure the dry-run doesn't alter the Working Copy.)
>>
>> Now this poses an issue when the conflicting file is marked conflicted
>> by some other operation.
>> This other operation will create two files (
>> filename._/*2*/_.merge-left.rXYZ, filename._/*2*/_.merge-right.rDEF ).
>>
>> Currently, the resolve is reading from the highest numbered set of
>> files (I think).
>>
>> As a side-effect of this experiment, I noticed this :
>>
>> Removing these files causes the node to lose it's conflict state (why
>> should the status command rely on the presence/absence of conflict
>> resolution files to display the status).
>
> It's long standing behaviour that removing the left/right files is one
> way to resolve a conflict.
>
Oh.. okay...
Received on 2011-03-04 12:31:40 CET

This is an archived mail posted to the Subversion Dev mailing list.