From: Markus Schöpflin (markus.schoepflin_at_[hidden])
Date: 2006-03-28 02:54:37
Joaquín Mª López Muñoz wrote:
> When merging changes in boost/index.htm from HEAD to
> RC_1_34_0, seems like there's no way to have both branch
> and trunk to show *exactly* the same contents, as the
> CVS $Date$ facility kicks in on every commit thus automatically
> desynching files when a merge is tried. This $Date$ stuff can
> be seen at about the end of index.htm:
> <p>Revised $Date: 2006/03/28 07:01:13 $</p>
> So, the result (if I'm not wrong) is that you'll always have merge
> conflicts when synching this file between trunk and branch, or
> the other way around, no matter how carefully you play with
> merge ops and merged_to_RC_xx tags.
> * Is this really so, and it's a (minor) problem we have to live with?
> * Am I wrong and there's a way to handle the issue?
Does this help?
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk