> 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
>
Yes, but you can't select the changset that created the branch by selecting
rev. of branch creation because branch didn't exist at (rev. create - 1), but
TSVN doesn't see that. This is what, a part, I'm talking about.
Then, you have to select original branch, from which dev. branch had been
copied, by deselecting 'Use "From" URL' and 'stop on copy'. What a mess !!
I would be glad to do the same thing by simply selecting all the rev. starting
at the branch creation to last changeset I want to merge and let TSVN see that
I wanted to merge changes from when it at been copied...
Regards.
lilian grange
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 22 10:35:32 2006