RE: Probably a Bug: Lost data merging!

> Greetings, I notified a problem during merging data between branches, there is
> a loss of data.
> The test to do is really simple:
>
> STEP 1: On 2 different branches, modify a file, especially a row in different
> ways, and commit in each branches to create a simple conflict.
> STEP 2: Then on the first branch, edit another file and commit (this is needed to
> merge with separated revisions ([1-2][3-4] for example).
> STEP 3: Then on the first branch, edit simply another row (this modify will be
> lost!).
>
> Now go on the second branch and merge this two revisions ( step 1 and step 3
> of the first branch).
> You'll get a conflict, select resolve all later.
>
> Now: if you open the file with a simple text editor, you will see the conflict to
> resolve and the row modified on step 3.
> The Problem: if you open it with Tortoise Merge (through 'Edit Conflict' of
> TortoiseSvn), you will be able to merge the conflict on step 1, but you'll LOST
> the step 3 modify!
>
> Absurd, we lost some times data in this way.
> Please help me find why we are doing bad, what is the correct way to do that?
> Is this a bug? I think yes.

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?

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?

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?

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-03-15 15:20:36 CET