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

short question about merge [PROPOSAL] vs. tree-deltas

From: Tom Lord <lord_at_emf.net>
Date: 2003-04-16 02:28:18 CEST

v.a.p. looks at a revision tree like this:

                        ANCESTOR
                          / \
                      ... ...
                        / \
                     ORIG TARGET
                    ...
                      /
                    MOD

Let's suppose that the trees for ANCESTOR and ORIG have:

        dir1/file1 == node_N.copy_C.rev_R
        dir2/file2 == node_N.copy_C.rev_R

(Note that the two file-rev nodes are identical.)

The tree for MOD has:

        dir1/file1 == node_N.copy_C3.rev_R3
        dir2/file2 == node_N.copy_C4.rev_R4

(the files have not been renamed since ORIG, but they have been
modifed, and the copy_ids lazilly modified.)

And the tree for for TARGET has:

        dir5/file5 == node_N.copy_C5.rev_R5
        dir6/file6 == node_N.copy_C6.rev_R6

(the files have been both renamed (multiple times, let's assume) and
modified.)

Now I want to merge ORIG...MOD into TARGET.

This is the first merge between these branches.

What happens?

-t

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Apr 16 02:17:50 2003

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