Re: [Gnu-arch-users] Re: cvs interoperation question

[Miles Bader]

On Fri, Apr 30, 2004 at 05:52:24PM -0400, Stefan Monnier wrote:
> > With `halfway' operation like tla-cvs-sync uses, you can fully update
> > from CVS first, which gives you a free hand in the other direction (note
> > that the initial update from CVS is only commited to arch after all the
> > arch changsets have been committed to CVS).
> 
> BTW, how do you deal with conflicts?

Fix them.  :-)

tla-cvs-sync aborts upon the first sign of any conflict; once the conflicts
are fixed, you just run it again to continue.

[Currently since only occasional changes (mine) go in the arch->CVS
direction, conflicts are very rare.]

-Miles
-- 
Love is a snowmobile racing across the tundra.  Suddenly it flips over,
pinning you underneath.  At night the ice weasels come.  --Nietzsche