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

Re: [TSVN] TortoiseSVN Issue: Merge dialog decrements selected From revision

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-09-09 17:22:59 CEST

Tobin Bergen-Hill wrote:
> When merging changes on a branch to a main development branch (or
> trunk), if the user uses the Show Log button near the From revision
> field to select the revision when the branch was created, the Merge
> dialog subtracts one from the result returned from the Log dialog. If
> the user does not correct this, the merge fails because the starting
> revision does not exist on that branch.
> Please fix this so that the From revision field uses the specified
> branch in the Log dialog.

That's a feature, not a bug. If you select a revision to merge (or a
range of revisions), then you *must* subtract one from the revision you
want to merge.
you want to merge revision 102 back into the trunk. So you must merge
from revision 101 to revision 102.

Also, update to version 1.2.2 please.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 9 17:23:22 2005

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