[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: monoc <frederic.ville_at_gmail.com>
Date: Wed, 17 Jun 2009 11:34:20 -0700 (PDT)

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.

Thanks again for your help.
Frederic

On Jun 17, 11:23 am, Stefan Küng <tortoise..._at_gmail.com> wrote:
> On Wed, Jun 17, 2009 at 20:15, monoc<frederic.vi..._at_gmail.com> wrote:
> > snif, snif,... still not working with svn, version 1.6.2 (r37639).
> > Would it be a bug with the command line client?
>
> first make sure that you're really using svn 1.6.2 by typing
> $ svn --version
> and check the output.
>
> then try the merge like this:
> $ svn merge ^/trunk . -r1:HEAD --force
>
> 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&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-17 20:35:33 CEST

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