[Top][All Lists]

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

Delete and Replace a Branch?

From: Kenneth Litwak
Subject: Delete and Replace a Branch?
Date: Wed, 1 Nov 2006 11:50:45 -0800

  I have two branches on the same code.  The first is the one that feeds
production (Rel 2.0).  The other, Rel 2.1, was created for a specific
development project and does not reflect ongoing changes to 2.0.  I
tried to merge them today and there are so many conflicts, including in
many files that actually are not changed in 2.1 that I think the very
best thing to do is to remove the Rel 2.1 branch and start from scratch.
I can't find a CVS command to remove my abc2.1 branch.  I always have
trouble with CVS commands, so maybe I'm just missing something, but I'd
really appreciate it if someone could give the commands to 1.  delete
the branch.  2.  Replace it with the abc2.0 branch as the base of
abc2.1.  Right now I have

I tried emptying apu-reg2.1 and doing 
cvs update -p 
in order to remove all the empty directories from the branch but that
command failed and I don't know what to do.  I've read the doc but I'm
not getting it.  Thanks.


reply via email to

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