> $ 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 1.3.2.2
retrieving revision 1.3.2.3
diff -r1.3.2.2 -r1.3.2.3
5a6
> 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.
http://tc.deals.yahoo.com/tc/blockbuster/text5.com
