Re: Branch Merging

[Fabian Cenedese]

>cvs update -j v3_1-patch x.c
>(x.c was still currently at revision 1.21)
>
>The update went fine (I think) file was merged etc.  But just to make
>sure I did a few diffs on the files etc. and noticed that yes it did
>move my new lines near the bottom of the file but it completely dumped
>the latest changes from the main trunk (that one line near the top). 
>Is is really supposed to do things this way.  It seems that it merged
>with version 1.21 and then just put that version on the head.  I would
>expect it to merge with 1.21 but then to merge 1.21 with the head to
>try to get everything up to date.  Am I just asking too much?

What happens if you tag the new branch (with x.c 1.21.2.1)
and merge with this tag instead of the branch tag?

bye  Fabi