[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merging between trunks and branches

From: Mark Smith
Subject: Re: merging between trunks and branches
Date: Mon, 7 Apr 2008 23:58:15 -0700 (PDT)

> $ cvs update -dP -A
> $ cvs update -dP -j SB1 -j EB1
> ... resolve conflicts, etc....
> $ cvs commit

Thanks Sergei, this is exactly what I am doing but
maybe I misunderstand something.

If I diff the bug fix for example ...

cvs diff -r SB1 -r EB1
Index: cvstags_main/source.txt
RCS file: /CVScygwin/cvstags/source.txt,v
retrieving revision
retrieving revision
diff -r1.3.2.2 -r1.3.2.3
> This is bug fix 1.

So in plain English, one line was added to the branch
as a bug fix, now I just want to add this line to the
file on the main trunnk.

Why can't CVS just add this line, I don't understand
why I get conflicts?

You rock. That's why Blockbuster's offering you one month of Blockbuster Total 
Access, No Cost.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]