On Wed, Dec 04, 2002 at 12:07:07PM +1000, Allan Rae wrote:

> Then you should do as many other CVS-based projects do (gdb for
> example) and start a new branch every so often and roll your
> patch (branch to original trunk point) forward.
> 
> I've found that merging the trunk into the branch works fine once.
> After that things get hairy and it's simpler to start another branch
> and roll your changes forward into that.

With all that administration, I'm even less inclined to do so then.

CVS is worse at handling conflicts in such cases than patch is

regards
john
-- 
"Trolls like content too."
        - Bob Abooey, /.

Reply via email to