Rewriting changeset order on push/pull (keeping the history graph tidy)

Stanimir Stamenkov s7an10 at netscape.net
Mon Aug 13 20:39:01 UTC 2012


Mon, 13 Aug 2012 21:57:11 +0200, /Arne Babenhauserheide/:

> If you don’t need the merges, you can do it like this:
>
>      hg log -r "all() - merge()" -G

Would it be possible to hide just intermediate merges from:

@    13: [fork]  Merge with central - fork-user-1
|\
| o  12: [fork]  Blah-blah - fork-user-2
| |
o |  11: [central]  Add more content - central-user-1
| |
o |  10: [central]  Replace LICENSE clause - central-user-2
| |
| o  9: [fork]  Fix a problem - fork-user-2
| |
| o  8: [fork]  Develop further - fork-user-1
| |
| o  7: [fork]  Merge latest central into fork - fork-user-1
|/|
o |  6: [central]  Start developing on something - central-user-2
| |
| o  5: [fork]  Update with latest central changes - fork-user-2
|/|
o |  4: [central]  Add a LICENSE - central-user-1
| |
| o  3: [fork]  Add new stuff - fork-user-1
|/
o  2: [central]  Change README - central-user-1
|
o  1: [central]  Enhance README - central-user-2
|
o  0: [central]  Initial check-in - central-user-1

So it becomes something like:

@    13: [fork]  Merge with central - fork-user-1
|\
| o  12: [fork]  Blah-blah - fork-user-2
| |
o |  11: [central]  Add more content - central-user-1
| |
o |  10: [central]  Replace LICENSE clause - central-user-2
| |
| o  9: [fork]  Fix a problem - fork-user-2
| |
| o  8: [fork]  Develop further - fork-user-1
| |
o |  6: [central]  Start developing on something - central-user-2
| |
o |  4: [central]  Add a LICENSE - central-user-1
| |
| o  3: [fork]  Add new stuff - fork-user-1
|/
o  2: [central]  Change README - central-user-1
|
o  1: [central]  Enhance README - central-user-2
|
o  0: [central]  Initial check-in - central-user-1

(I should really practice the possibilities of revsets but currently 
I would really love a ready hint.)

-- 
Stanimir



More information about the Mercurial mailing list