Thanks Simon.. it's good to know that I'm doing the right thing :)
On Nov 25, 11:09 am, "Simon Large" <simon.tortoise..._at_googlemail.com>
wrote:
> 2008/11/25 Taras_96 <taras..._at_gmail.com>:
>
>
>
> > Hi everyone,
>
> > I'm a bit confused about a possible fence post condition using
> > tortoise svn.
>
> > I'm merging a branch back into the trunk. Say HEAD is at revision 5,
> > and I wish to merge all changes from the branch back into trunk, so I
> > specify the range as 1-HEAD. This will merge revisions 1-5.
>
> > I make more changes to the branch, and now I wish to merge the changes
> > made *since* revision 5. If I specify that I wish to merge revisions 6-
> > HEAD, then when I click on 'Merge', the box containing a trace of what
> > Tortoise is doing will read 'Command Merging revisions 5 - 10' (or
> > whatever the HEAD happens to be). That is, Tortoise has subtracted one
> > from the revision I specified automatically.
>
> > I'm quite sure this is correct, but would like to check with the NG.
>
> Yes it is correct. There is an explanation in the help file, but it
> needs clarifying. In TortoiseSVN we are treating revisions to be
> merged as changesets (fence panels) because it is easier for most
> users to understand. The underlying subversion API requires the
> difference between two points (fence posts), which is what is being
> displayed in the progress dialog.
>
> Simon
>
> --
> : ___
> : oo // \\ "De Chelonian Mobile"
> : (_,\/ \_/ \ TortoiseSVN
> : \ \_/_\_/> The coolest Interface to (Sub)Version Control
> : /_/ \_\ http://tortoisesvn.net
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-11-28 15:44:08 CET