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

TortoiseMerge Bug?

From: Luca Mazzanti <luca.mazzanti_at_seltris.it>
Date: Fri, 2 Mar 2012 11:49:01 +0100

Hi,

I had a problem during developing with SVN.

It is occurred sometimes that we lost a few modification, during merge
through branches of our project.

Yesterday we found an example, I try to explain:

 

BRANCH 1

File A rows:

1. Row1 a

2. Row2 a

 

Commit 1

----------------------------

<a modify on another file>

Commit 2

----------------------------

Modify File A rows:

1. Row1 a

2. Row2 b

 

Commit 3

----------------------------

 

BRANCH 2

File A rows:

1. Row1 b

2. Row2 a

 

 

So I have 1 file in a branch, and I apply two not adiacent commit on that:

· The first ‘Commit 1’ will throws up a conflict

· The second modify another row, without conflict

 

I merge from branch 1 to branch 2, selecting Commit1, Commit3.

During merge it shows:

· Merging revision [0-1] confilict

· Update revision [1-2] merged

 

Resolve now? Resolve Later? Ÿ I Select Resolve Later

 

Now the file is (or something similar):

 

<<<<<<< .working

Row1 b

=======

Row1 a

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

Row2 b

 

So I have:

1. The conflict

2. The second row updated correctly

 

BUT, if I resolve this conflict by clicking Tortoise > Edit Conflict, it
shows through TortoiseMerge (or Kdiff3, …) :

<<<<<<< .working

Row1 b

=======

Row1 a

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

Row2 a

 

And when I save, I loose the second update, and this update is signed in svn
as yet merged correctly.

 

Please help me comprehend why I am in error, or why editing this file by
tortoise I loose my update.

Thanks a lot, Mazzanti Luca

 

If you need, I have a simple project example, and a lot of screenshots.

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

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

This is an archived mail posted to the TortoiseSVN Users mailing list.