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

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

From: <thomas.oftring_at_arcor.de>
Date: 2007-11-07 22:00:11 CET

Hello Stefan,

> tmto@arcor.de wrote:
> > Hello,
> >
> > I tested the new merge wizard in Build 11278. I tried to "Merge
> > revision range". I left the text box "Revision range to merge" blank.
> > The dialog says "To merge all revisions, leave the box empty." But if
> > I do this there is nothing to merge.
> >
> > If I select the revisions there are files to merge, and the merge
> > could be finished successfully.
> It depends on whether the server knows about merge tracking or not. If
> it doesn't, then nothing is merged. If it does, everything not yet
> merged is merged.
> Stefan

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.


Viel oder wenig? Schnell oder langsam? Unbegrenzt surfen + telefonieren
ohne Zeit- und Volumenbegrenzung? DAS TOP ANGEBOT FÜR ALLE NEUEINSTEIGER
Jetzt bei Arcor: günstig und schnell mit DSL - das All-Inclusive-Paket
für clevere Doppel-Sparer, nur 29,95 € inkl. DSL- und ISDN-Grundgebühr!

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:05:46 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.