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

Re: Merge works fine with Turtoise but not with my command line

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 17 Jun 2009 20:36:52 +0200

On Wed, Jun 17, 2009 at 20:34, monoc<frederic.ville_at_gmail.com> wrote:
> Hi Sefan, no doubt that I used svn 1.6.2.
>
> I downloaded svn, version 1.5.4 (r33841) and I tried again my test
> case. It works perfectly fine and I got the expected result:
> $> svn merge svn://xxx/svn/trunk --dry-run
> --- Merging r4 through r5 into '.':
> A    file2
>
> I think there is definitely a regression with 1.6.x. I will raise a
> ticket to the team.

svn 1.5.x doesn't support tree conflicts, that's why it works with
such a client, that's not a regression.

Do you use TSVN 1.6.2 to compare the merges with your svn client?

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=2362946
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-17 20:37:24 CEST

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