Re: Common Use-Cases for Merging

Christopher Ness wrote:

> Visually, it looks like this, time is left to right:
>
> [changes made]
> /branch --------- bar.c@11 ------------------ bar.c@12
> |[copy] |
> | |[merge]
>
> /trunk/ --------- foo.c@10 ------------------------------------
> | |
> |[copy] |
> |-- bar.c@11 -------------------------- bar.c@13

Actually, my case is slightly different (the main point is foo.c was
branched as foo.c, only later becoming bar.c).

                        [changes made]
  /branch ------- foo.c@5 ------- foo.c@8-------------------
                |[copy] |[merge] |
                | | bar.c@10--------
                | | |[merge]
  /trunk ----- foo.c@4 --------- foo.c@9-------------------
                                  | |
                                  |[copy] |
                                  |-- bar.c@11-- bar.c@13---

> Thanks for the mental gymnastics.

You're welcome! And thanks for reminding me of these diagrams.

Joe

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Dec 23 05:39:10 2004