>>>>> "Mike" == Mike Castle <[EMAIL PROTECTED]> writes:

 Mike> On Wed, Apr 11, 2001 at 06:06:22PM -0700, Paul Sander wrote:
 >> - If a branch is merged multiple times to an ancestor, don't count
 >> the result of the prior merge as a conflict.  (Remember, CVS
 >> performs a

 Mike> As I said in an earlier post, this can be scripted around.

can you give me an idea as to what such a script might look like?
wouldn't there have to be some sort of 'database' which kept track of
when/where the prior merges happened?

-- 

joe

_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Reply via email to