|
From: | Paul Sander |
Subject: | Re: CVS merge does not detect changes between HEAD and branch (was: Question on loginfo.) |
Date: | Tue, 20 Jun 2006 23:45:36 -0700 |
So, it's important to tag the committed result of every merge, avoiding race conditions (i.e. use "cvs tag" on the workspace from which the merge was committed, not "cvs rtag"), and use that tag as the ancestor for the next merge. This is explained somewhere in the documentation.
On Jun 20, 2006, at 10:40 PM, Spiro Trikaliotis wrote:
Hello, * On Wed, Jun 21, 2006 at 07:30:14AM +0200 I wrote:looking through one blog I regularly visit, I found the following problem description about CVS:and sorry for using a wrong subject; I pressed "send" to fast. Regards, Spiro. --Spiro R. Trikaliotis http://opencbm.sf.net/ http://www.trikaliotis.net/ http://www.viceteam.org/_______________________________________________ info-cvs mailing list address@hidden http://lists.nongnu.org/mailman/listinfo/info-cvs
--Paul Sander | "Lets stick to the new mistakes and get rid of the old
address@hidden | ones" -- William Brown
[Prev in Thread] | Current Thread | [Next in Thread] |