multipart merging and postponed conflict resolution

Hi.
The TortoiseSvn has a new great feature - merge wizard alloys to make
multiple revision ranges merge.
It is very useful to make maintenance merge when merging an issue was
fixed with multiple commits.

But one thing makes "multimerge" dangerous.
I try to not use an interactive merge as far as it possible. It alloys
to split one entire merge operation to many little conflict resolving.

In case of multimerge operation internally we have several merge
sessions. Some session may be finished with merge conflicts.
If one of the next merge session tries to merge into conflicted file
then it makes an unpredictable results.
It creates in one way files with nested merge parts like this:
<<<<<<< .working
<<<<<<< .working
bbbbb
=======
22222
>>>>>>> .merge-right.r4
=======
44444
>>>>>>> .merge-right.r6

in other way the conflicted file looks like usual (without nested <<<,
===, >>> parts) but It losts some changes!

The steps for reproduce were described by me in this conversation thread:
http://subversion.tigris.org/ds/viewMessage.do?dsMessageId=98194&dsForumId=1065

The workaround is "do interactive conflict resolving in case of
multi-part merge operation".

It will be very useful to check WC _before_ applying next part of merging.
If next merge part affects the file witch in conflicted state then ask
to resolve previous conflict interactively or stop merging.

Thanks

--
Andrey
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1187088
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].