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

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

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

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

-- 
        ___
   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 21:44:53 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.