2006/11/21, Simon Large <simon@skirridsystems.co.uk>:
> On Tue Nov 21 8:44 , lilian grange <l.grange@yahoo.com> sent:
>
> >lilian grange yahoo.com> writes:
> >> When using 'Show Log' dialog I select the range from branch creation rev. to
> >> the last rev. I want to merge.
> >> But when I'm back to 'Merge' dialog TSN filled the from rev. to (creation
> >rev. -
> >> 1) which in fact doesn't work because in (creation rev. - 1) branch didn't
> >> already exist... TSN should have been set it to creation rev.
No, TSVN is doing the correct thing.
What you select in the Show Log dialog is the *changesets* that you
want to merge. The numbers in the merge dialog are the *revision*
numbers. The changeset 123 contains the difference between 122 and
123, that's where the -1 comes from.
> To answer the question, it is not really an issue. You want to merge the
> revisions that made changes on your branch, but you do not want to merge the
> revision that created the branch. The branch creation revision should not be
> selected. I thought this was clear in the manual now.
In addition, when you want merge a complete branch, always select the
changset that created the branch. It is possible that the branch
creation changeset contains changes to file contents as well, and
usually you want to merge these changes, too.
Norbert
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 22 08:16:25 2006