[Top][All Lists]

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

Re: Merge issue with deleted files

From: Larry Jones
Subject: Re: Merge issue with deleted files
Date: Sat, 7 Nov 2009 11:14:16 -0500

Cristian writes:
> As I mentioned before, what gets me is the different behaviour of CVS
> with regards to using one -j vs two -j's.

That's completely intentional.  One -j merges two branches with a common
ancestor, so CVS considers all the changes along both branches.  Two
-j's applies one set of changes to a specific revision -- there's only
one set of changes, so there's nothing to conflict.  Remember: with two
-j's, the set of changes can be completely disjoint from the revision
you're applying them to; what changes would you want CVS to consider? 
In your case, there just happens to be an obvious choice, but what if
you were applying the changes between and to --
would you really want to go back to the common ancestor at 1.3?
Larry Jones

When I want an editorial, I'll ASK for it! -- Calvin

reply via email to

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