RE: Probably a Bug: Lost data merging!

> I'm having trouble following what you are saying with "first branch",
"second branch" etc.

> For example, is one branch an ancestor of the other, or are they both
branches of some other common ancestor?

"Second Branch" was created time ago from the first.

> I guess I don't understand what the Step 3 modify has to do with the
merge.

> Has the "step 3" modify been committed or are you merging into a working
copy that has pending changes?

Step 3 is a commit, on a different row (than the crow that will be in
conflict) of the same file that will be in conflict (cause of the previous
one).

> Can you create a script to demonstrate the problem...

> or at least something more specific above with files names and path...
starting with creating the branches?

I can refer to another link
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061
<http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=
2928687> &dsMessageId=2928687

But is really simple:

1) on two different branches, modify a row of the same file to generate a
simple conflict.

2) In the branch 1, do other 2 commits on other rows of the file.

3) Then merge the 1) point commit and the last commit (so you select 2
revisions not in a sequence, but separated with another one not to merge)

in the branch 2.

You will see the merged file in conflict (select resolve later) tha contains
something like this:

<<<<<<< .working

Row in conflict branch1

=======

Row in conflict branch2

>>>>>>> .merge-right.r1

Row merged without conflict from branch1 to branch2

Ok so if you edit the conflict with this file with tortioseMerge (clicking
edit conflict on TortoiseSVN interface):

You will see that:

<<<<<<< .working

Row in conflict branch1

=======

Row in conflict branch2

>>>>>>> .merge-right.r1

You lost the revision merged, after the revision in conflict.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2936694

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-03-16 16:07:11 CET