Strategies for push/merge problem?

Roman Kennke roman.kennke at aicas.com
Tue Jul 15 01:00:24 CDT 2008


Hey,

Am Montag, den 14.07.2008, 18:16 -0400 schrieb Doug Philips:
> On Monday, July 14, 2008, at 05:58PM, "Benjamin Smedberg" indited:
> >Johannes Stezenbach wrote:
> >It's a source of complaint, but not overwhelming. Some people are content to 
> >do a merge; others really object to history cluttering and spend time 
> >rebasing the commit forward, either manually or with MQ.
> 
> Yes, it takes effort to make the history something that it is not.
> The merges show just where things went parallel and how they were merged.
> rebasing makes believe that one thing happened after another.
> Since that isn't actually what happened, work has to be spent re-writing history. :)

What about hg log -M ?

/Roman

-- 
Dipl.-Inform. (FH) Roman Kennke, Software Engineer, http://kennke.org
aicas Allerton Interworks Computer Automated Systems GmbH
Haid-und-Neu-Straße 18 * D-76131 Karlsruhe * Germany
http://www.aicas.com   * Tel: +49-721-663 968-48
USt-Id: DE216375633, Handelsregister HRB 109481, AG Karlsruhe
Geschäftsführer: Dr. James J. Hunt




More information about the Mercurial mailing list