[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: Thu, 18 Jun 2009 14:02:03 -0700 (PDT)

To let you know that it was well a bug in release 1.6.1, fixed in the
1.6.2. The reason that I still got the same issue with my svn client
1.6.2 was because it was dialoging with a svn server (svnserve -d)
started with release 1.6.1...

Thanks again for your precious help
Frederic

On Jun 17, 12:20 pm, monoc <frederic.vi..._at_gmail.com> wrote:
> OK, I read the specs and it seems that the tree conflict is not
> justified in my case. I wrote to the SVN team and wait for their
> feedback.
>
> On Jun 17, 11:48 am, monoc <frederic.vi..._at_gmail.com> wrote:
>
>
>
> > No, I use TortoiseSVN 1.5.3, Build 13783 (Subversion 1.5.2), that's
> > why it worked... I see.
> > Here is my svn command line client version:
> > svn, version 1.6.2 (r37639)
> >    compiled May 16 2009, 13:25:31
>
> > I don't get the tree conflict principle. According to you, should I
> > get a conflict with 'file1' during the merge?
>
> > On Jun 17, 11:36 am, Stefan Küng <tortoise..._at_gmail.com> wrote:
>
> > > On Wed, Jun 17, 2009 at 20:34, monoc<frederic.vi..._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&dsMess...
>
> > > To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].
>
> > ------------------------------------------------------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&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-19 07:03:10 CEST

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