Strategies for push/merge problem?

[Arne Babenhauserheide]

Am Montag 14 Juli 2008 17:45:08 schrieb Doug Philips:
> If you try to shoehorn Mercurial into CVS's shoes, yes, it will be painful
> at time.

I think, it shouldn't be. 

cvs just commits to the repository, so I could think of an extension which 
does a "centralized commit": 
hg commit --synchronized -m "<text>" 

equals: 
hg commit -m "<text>" # local commit, all changes get saved. 
hg pull -u
hg merge (if necessary)
- switch to diff-resolution-tool if necessary, just has to find conflicts. 
hg commit -m "merge <text>" (if necessary)
hg push


And for a quick fix: 
hg record -m "<text"> -> select the changes you want to commit
hg push

And if nothing else works, just 
hg push -f # yes, do create a new head. People can then merge it themselves, 
or the rogue committer can do the merge. 

It's not only your job to keep the repository clean. If you have a quick fix, 
just push it in as a new head. 

Best wishes, 
Arne

-- Weblog: http://blog.draketo.de
-- 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/20080714/e161f602/attachment.pgp