History senstive merging?

[Arne Babenhauserheide]

Am Donnerstag 11 Dezember 2008 19:55:42 schrieb Neal Becker:
> > 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.

Logically copy seems to be the right way, since they have common ancestry. 

Copying the files just sets the branching point where they begin to differ (at 
least as I understand it). 

Best wishes, 
Arne
-- 
-- My stuff: http://draketo.de - stories, songs, poems, programs and stuff :)
-- Infinite Hands: http://infinite-hands.draketo.de - singing a part of the 
history of free software.
-- Ein Würfel System: http://1w6.org - einfach saubere (Rollenspiel-) Regeln.

-- PGP/GnuPG: http://draketo.de/inhalt/ich/pubkey.txt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
Url : http://selenic.com/pipermail/mercurial/attachments/20081211/a32a0270/attachment.pgp