[Top][All Lists]

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

Re: Have lots of "needs patch" and "needs merge"

From: Larry Jones
Subject: Re: Have lots of "needs patch" and "needs merge"
Date: Thu, 15 Nov 2007 11:50:42 -0500 (EST)

Fierke, John writes:
> I am currently running (don't laugh) version 1.11 on a solaris machine.

That version is *very* old -- I strongly suggest you upgrade to the
latest stable version (1.11.22), which contains many bug fixes.  But
that's not the source of your problem.

> Something I did (at least I *THINK* it was me) caused most of the files
> to now show as either "Needs Merge" or "Needs Patch"...I CANNOT identify
> a pattern behind why some are "merge" and others are "patch".  We had an
> issue with a few of the files that the contractor transferred to our
> site having carriage returns in them (^M's) - we removed fixed those
> files.  And there are even files that show "Locally modified".

"Needs Merge" indicates that the file has been modified in the working
directory and there's also a newer version in the repository than what
was checked out, so the changes need to be merged.  "Needs Patch" means
that the local file has not been modified but there's a newer version in
the repository that should replace it.  "Locally Modified" means that
the local file has been modified but there's no newer version in the

>From what you said you did, I suspect that the files from the contractor
that you overlaid included the CVS/Entries files that CVS uses to record
the repository version and timestamp for each file in the working
directory.  If that's the case and that data is actually correct, then
what CVS wants to do is exactly the right thing to do, assuming you want
to keep the changes that have been made to the repository since the
contractor got the original files.  You should do an "update" to handle
the merges and patches, resolve any conflicts, test everything, then
commit the changes.  If the data is not correct, or you don't want to
keep the repository changes, then you need to start over with a new
working directory and be sure not to overlay the CVS/Entries files.

-Larry Jones

What better way to spend one's freedom than eating chocolate
cereal and watching cartoons! -- Calvin

reply via email to

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