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

Re: Aw: Re: Merge Wizard - Bug or operating error? - Build 11278

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-11-07 22:12:36 CET

thomas.oftring@arcor.de wrote:

> What does you mean with if the server knows about merge tracking or
> not. I created the Repository with the nightly build. So it should be
> a repositry that is able to know about merge tracking. If I choose
> the revisions, the revisions which have already been merged are
> greyed and i can`t choose them. So I thinke the repositry contains
> the info, which revision havre already been merged.
> Hope you have enought time to explain this to me.

If you did this is a new repository created with the same TSVN version
as you did the merge, then it should have worked as I said.
But of course you have to remember that both TSVN and Subversion are not
yet stable, and especially the Subversion library changes a lot in
respect to merge tracking - that means the behavior could have changed
and I haven't noticed it yet.

I'll take a closer look this weekend - maybe I have to change TSVN to
make this work again, or there might be a bug in the SVN library, or....


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 7 22:13:16 2007

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

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