[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: CVS merge does not detect changes between HEAD and branch
From: |
Spiro Trikaliotis |
Subject: |
Re: CVS merge does not detect changes between HEAD and branch |
Date: |
Wed, 21 Jun 2006 09:13:15 +0200 |
User-agent: |
Mutt/1.5.9i |
Hello Paul,
* On Tue, Jun 20, 2006 at 11:45:36PM -0700 Paul Sander wrote:
> 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.
Thank you for (re-) explaining it to me. Now, I even remember WHY I
always tag the point which I merged. ;)
Regards,
Spiro.
--
Spiro R. Trikaliotis http://opencbm.sf.net/
http://www.trikaliotis.net/ http://www.viceteam.org/