Strategies for push/merge problem?

[Arne Babenhauserheide]

Am Freitag 09 Januar 2009 10:29:52 schrieb Matt Mackall:
> On Fri, 2009-01-09 at 10:27 +0100, Arne Babenhauserheide wrote:
> > 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?
>
> Server-side merge is a non-starter, as discussed before. Client-side,
> sure.

Not for the mainline client, but there are people who want to use that in 
their workflows - I could use it to damn quickly update websites on a server 
for example, and while it can create problems, it should work as hook. 

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/7daedcaa/attachment.pgp