info-cvs
[Top][All Lists]
Advanced

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

Merge not adding or removing files


From: Keith Beattie
Subject: Merge not adding or removing files
Date: Mon, 27 Nov 2000 21:38:23 -0800

Hi all,

It seems that when merging a branch to the Trunk, files added or removed on
the branch are not added or removed on the Trunk if said file has been
modified on the Trunk.  When doing the merge with a 'cvs -q up -dP -j
StaticMergePointTagOnBranch',  for files modified on the Trunk, I get the
message:

        cvs update: file foo.java has been modified, but has been removed in
revision StaticMergePointTagOnBranch

if foo.java has been removed on the branch I get the message

        cvs update: file bar.java exists, but has been added in revision
StaticMergePointTagOnBranch

if bar.java has been added on the branch.

Is there a way to have the 'cvs up -j' command do the addition or removal in
the Trunk (as was done on the branch) or at least mark it more clearly as a
conflict of some sort?  Namely, mark it as a conflict that a subsequent 'cvs
-nq up' or 'cvs stat' would report?

TIA,
ksb



reply via email to

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