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

Re: Conflicts cherrypicking lots of revisions

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 16 Jan 2009 23:54:10 +0100

Paulo Eduardo Neves wrote:
> I don't understand some conflicts while cherrypicking revisions using
> TortoiseSVN.
>
> I'm merging from a development branch to a release branch. Conflicts
> here should be very rare, since I'm applying sequential revisions and
> all the modifications of the release branch come from the development
> branch.
>
> I use a filter in the log dialog of the branch and select lots and
> lots of revisions. A few of them have already been merged. If I try to
> merge, a lot of conflicts appear. But if I merge till the revision
> before where the conflict happened, and then merge the problematic
> revision, I get no conflicts!
>
> Would someone explain me why? Is it a bug or a limitation?
>
> To merge all my revisions I have to select some revisions, test the
> merge, see where the first conflict happens, merge till the revision
> before the conflict, rinse and repeat. It's a tedious and error prone
> process. Right now I'm coding a script to do it.

If your server doesn't support merge tracking, then you must not merge
revisions which you've already merged because that will cause a conflict.
To avoid such problems, upgrade your server to Subversion 1.5.x

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1029606
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-01-16 23:54:30 CET

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