Not an issue ? - Merging a Range of Revisions

Norbert Unterberg <nunterberg <at> gmail.com> writes:

> Even if the branch did not exist in the revision the merge dialog
> displays as "from" revision, the merge will succeed. Subversion is
> using PEG revisions here and automatically tracks where the branch
> came from. If that does not work in your TortoiseSVN, then you are
> using a very old version, since this bug has been fixed a very long
> time ago.
>
> Norbert
>

If there is a way to know the original branch, why it isn't displayed in "from"
field in the merge dialog:

        br. A br. B
        |
rev 1 |
        |
rev 2 |_________________
        | |
        | |

Here, branch "B" was copied AND modified from "A" then committed in rev 2. I
want to merge these changes back into "A", so in 'Show log' I select "B" in rev
2 - copy/creation rev. Back into merge dialog fields are filled as follow:

From URL : URL of br. B
From REV : rev 1

To URL : URL of br. B
TO REV : rev 2

It works! But, what I mean is that because "B" don't already exist in rev 1,
fields must be filled as follow:

From URL : URL of br. A <----- the original branch which exist in rev 1 !
From REV : rev 1

To URL : URL of br. B
TO REV : rev 2

Changes are made by diffing {A; 1} to {B; 2}. Is none sense to diff {B; 1} to
{B; 2}: "B" don't already exist in rev 1...

Regards.

lilian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Nov 23 11:34:38 2006