Differences between revisions 2 and 3
⇤ ← Revision 2 as of 2012-03-21 23:42:21 →
Size: 2838
Editor: 62
Comment:
← Revision 3 as of 2012-03-21 23:47:28 → ⇥
Size: 4902
Editor: 62
Comment:
Deletions are marked like this. Additions are marked like this.
Line 85: Line 85:
   label = "hg merge -r 6"    label = "hg commit -m 'merge 6'"
}
}}}

{{{#!dot
digraph {
   rankdir = LR
   node [shape=record]
   rev0 [label="{{<p1> p1 | <p2> p2} | rev 0:838e}"];
   rev1 [label="{{<p1> p1 | <p2> p2} | rev 1:34ef}"];
   rev2 [label="{{<p1> p1 | <p2> p2} | rev 2:4563}"];
   rev3 [label="{{<p1> p1 | <p2> p2} | rev 3:fe56}"];
   rev4 [label="{{<p1> p1 | <p2> p2} | rev 4:ac98}"];
   rev6 [label="{{<p1> p1 | <p2> p2} | rev 6:aoeu}"];
   rev5 [label="{{<p1> p1 | <p2> p2} | rev 5:sp09}"];
   rev7 [label="{{<p1> p1 | <p2> p2} | rev 7:sntr (tip)}"];
   workingdir [shape=record, label="{{<p1> p1 | <p2> p2} | working directory}"];

   rev0 -> rev1:p1 [dir=back]
   rev1 -> rev2:p1 [dir=back]
   rev1 -> rev3:p1 [dir=back]
   rev2 -> rev4:p1 [dir=back]
   rev3 -> rev4:p2 [dir=back]
   rev3 -> rev5:p1 [dir=back]
   rev3 -> rev6:p1 [dir=back]
   rev4 -> rev7:p1 [dir=back]
   rev6 -> rev7:p2 [dir=back]
   rev7 -> workingdir:p1 [dir=back]
   rev5 -> workingdir:p2 [dir=back]
   label = "hg merge -r 5"
}
}}}

{{{#!dot
digraph {
   rankdir = LR
   node [shape=record]
   rev0 [label="{{<p1> p1 | <p2> p2} | rev 0:838e}"];
   rev1 [label="{{<p1> p1 | <p2> p2} | rev 1:34ef}"];
   rev2 [label="{{<p1> p1 | <p2> p2} | rev 2:4563}"];
   rev3 [label="{{<p1> p1 | <p2> p2} | rev 3:fe56}"];
   rev4 [label="{{<p1> p1 | <p2> p2} | rev 4:ac98}"];
   rev6 [label="{{<p1> p1 | <p2> p2} | rev 6:aoeu}"];
   rev5 [label="{{<p1> p1 | <p2> p2} | rev 5:sp09}"];
   rev7 [label="{{<p1> p1 | <p2> p2} | rev 7:sntr}"];
   rev8 [label="{{<p1> p1 | <p2> p2} | rev 7:uidr (tip)}"];
   workingdir [shape=record, label="{{<p1> p1 | <p2> p2} | working directory}"];

   rev0 -> rev1:p1 [dir=back]
   rev1 -> rev2:p1 [dir=back]
   rev1 -> rev3:p1 [dir=back]
   rev2 -> rev4:p1 [dir=back]
   rev3 -> rev4:p2 [dir=back]
   rev3 -> rev5:p1 [dir=back]
   rev3 -> rev6:p1 [dir=back]
   rev4 -> rev7:p1 [dir=back]
   rev6 -> rev7:p2 [dir=back]
   rev7 -> rev8:p1 [dir=back]
   rev5 -> rev8:p2 [dir=back]
   rev8 -> workingdir:p1 [dir=back]
   label = "hg commit -m 'merge 5'"

@``ME@

https://plus.google.com/u/0/106066194294020619089/

Merge more than two heads

CategoryHomepage

SantiagoPaya (last edited 2012-03-22 00:05:55 by 62)