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

Re: Merge makes conflicts when done via GUI

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 22 Jul 2011 16:04:32 +0200

On 22.07.2011 13:49, Wilhelm Molterer wrote:
> Hello,
> TortoiseSVN is a very handy tool which makes working with SVN very easy, in my mind. But in the last few weeks I noticed some problems with merging. I always got conflicts and tree conflicts when mergin around.
> We have a trunk and a permanent development branch, where changes are made some times in both directions.
> To bring changes from trunk to the branch we call "merge a range of revisions" (with default settings) from the development branch's working copy and specify the trunk's URL in the "From" field.
> To bring the changes made in the development branches to the trunk we use "Reintegrate a branch" (also with default settings) from the trunk's working directory and specify the development branch's URL in the "From" field.
> I hope there's nothing wrong with this practice. In fact I've been doing so with other projects for years (mostly C#). But the problems now started in a PHP project.
> Things are different when I use the command line tool (all Windows, by the way):
> svn merge [URL, from where the changes should be taken from]

That's the short form of
svn merge -r1:HEAD url .

which should be the same as if you leave the revision range box in the
merge dialog empty.

Can you try leaving the box empty and see if that helps?


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-07-22 16:04:49 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.