History senstive merging?

[Matt Mackall]

On Thu, 2008-12-11 at 13:55 -0500, Neal Becker wrote:
> Giorgos Keramidas wrote:
> 
> > On Thu, 11 Dec 2008 13:33:21 -0500, Neal Becker <ndbecker2 at gmail.com>
> > wrote:
> >> What do you recommend for history sensitive merging?
> >>
> >> I have a file A, which I copied and modified into B.  Now I want to
> >> take the updates to A and apply them to B.  What 3-way diff tool is
> >> good for this?
> > 
> > If you used "hg copy A B" to perform the copy this will happen
> > automatically with _any_ merge tool.
> 
> Is hg copy appropriate for the case where A and B are intended to
> really be different files?  In my case, A & B are 2 python scripts
> that I want to always be different - yet they have common ancestry and
> features.

Mercurial only merges changes to copies that are 'simultaneous' with the
copy. That is, if someone does the change on a different branch that is
then merged. Changes to the original after the merge point are not
propagated.

-- 
Mathematics is the supreme nostalgia of our time.