bug-cvs
[Top][All Lists]
Advanced

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

patch for cvs 1.11.14/1.12.5 - added cvswrappers method - SKIP


From: Dean
Subject: patch for cvs 1.11.14/1.12.5 - added cvswrappers method - SKIP
Date: Thu, 18 Mar 2004 15:59:25 -0800

I have added issue 167 to the IssueZilla DB for cvs:

http://ccvs.cvshome.org/issues/show_bug.cgi?id=167

This is small patch to disable the cvswrappers merge with the option
SKIP.  The cvswrapper methods become MERGE, COPY or SKIP.

I am lucky enough to have twmerge to merge code. With the patch on, a
cvs update does not merge or copy updates for a file that I have
modified in my tree.  cvs status still reports the files as 'needs
merge'.

A ksh wrapper to twmerge will fetch the common ancestor and the updated
file and provide a three panel GUI to complete the merge.

Only had a chance to do basic functional testing on this patch.

Regs
-Dean





reply via email to

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