Strategies for push/merge problem?
Arne Babenhauserheide
arne_bab at web.de
Fri Jan 9 03:27:19 CST 2009
Am Montag 14 Juli 2008 12:24:13 schrieb Roman Kennke:
> Also: I still think that having a server-side automatic merge feature
> (as discussed in an earlier thread) would be VERY helpful, maybe as an
> additional command line switch for push, or even as an extension.
Is anyone still interested in something like this?
I just looked at the fetch extension, and I could adapt it to be a simplemerge
command in not too much time - if there is a need for that.
It could then simply be used as a hook in the central repo.
Best wishes,
Arne
--
-- Ein Würfel System: http://1w6.org - einfach saubere (Rollenspiel-) Regeln.
-- Infinite Hands: http://infinite-hands.draketo.de - singing a part of the
history of free software.
-- My stuff: http://draketo.de - stories, songs, poems, programs and stuff :)
-- 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/20090109/ade11932/attachment.pgp
More information about the Mercurial
mailing list