[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: CVS merge
Re: CVS merge
Wed, 12 Nov 2003 09:14:41 -0500
I think the problem is the start and end points of your merge.
If I have a trunk, and I created a branch from that trunk, tagging it at
the point it was created, I would use the following to merge the branch
back into the trunk:
-j branch_CREATED -j branch
Often this can simply be abbreviated as
If you are doing something more complicated than this, please tell us the
structure of the branches involved.
There are additional details on this subtle and complex feature here, in
the manual under the "Branching and Merging" section:
I advise you to read it carefully, or you will get into trouble.
address@hidden wrote on 11/11/2003
> I don't think my following merge result is correct. I
> did a merge in branch1 to join branch2 as following
> branch1$ cvs -q update -Pd -kk -j branch1 -j branch2
> There is only one file shown me the conflicts by
> "<<<<<<" and ">>>>>>" comments embedded in the file.
> Many other files in branch1 are simply replaced by
> branch2 source files and created .#file1.h.1.2.3,
> .#file2.c.1.2.5 ....
> For example, the file1.h in branch1 includes three
> functions A(), B() and C(). The file1.h in branch2 has
> only two functions A() and B(). I expected that the
> merged new file would include A(), B() and C(), but to
> be surprised, the new merged file has only A() and
> B(), same as branch2 source file. The function C() was
> simply lost. Is this normal behavior or am I missing
> something here?
> (CVS version 1.10 for Window, I guess, it is
> Thank you.
> Do you Yahoo!?
> Protect your identity with Yahoo! Mail AddressGuard
> Info-cvs mailing list