--- a/docs/tutorial/test-training.t Fri Nov 22 18:28:01 2019 +0100
+++ b/docs/tutorial/test-training.t Fri Nov 22 18:29:27 2019 +0100
@@ -354,7 +354,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -364,7 +364,7 @@
shape=circle,
style=filled,
width=1];
- 1 [fillcolor="#7F7FFF",
+ 1 [fillcolor="#7F7FFF",
fixedsize=true,
group=typo,
height=1,
@@ -374,7 +374,7 @@
shape=circle,
style=filled,
width=1];
- 0 -> 1 [penwidth=2.0];
+ 0 -> 1 [penwidth=2.0];
}
$ html_output $TESTDIR/output/fix-a-bug-base.log log -G -r "::typo"
@@ -446,7 +446,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -456,7 +456,7 @@
shape=circle,
style=filled,
width=1];
- 17 [fillcolor="#7F7FFF",
+ 17 [fillcolor="#7F7FFF",
fixedsize=true,
group=typo,
height=1,
@@ -466,7 +466,7 @@
shape=circle,
style=filled,
width=1];
- 0 -> 17 [penwidth=2.0];
+ 0 -> 17 [penwidth=2.0];
}
$ graph $TESTDIR/graphs/fix-bug-3.dot -r '::branch(typo)' --hidden -T "{shortest(node, 8)}" --public=yes
@@ -478,7 +478,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -488,7 +488,7 @@
shape=circle,
style=filled,
width=1];
- 1 [fillcolor="#DFDFFF",
+ 1 [fillcolor="#DFDFFF",
fixedsize=true,
group=typo_extinct,
height=1,
@@ -498,8 +498,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 0 -> 1 [penwidth=2.0];
- 17 [fillcolor="#7F7FFF",
+ 0 -> 1 [penwidth=2.0];
+ 17 [fillcolor="#7F7FFF",
fixedsize=true,
group=typo,
height=1,
@@ -509,8 +509,8 @@
shape=circle,
style=filled,
width=1];
- 0 -> 17 [penwidth=2.0];
- 1 -> 17 [arrowtail=dot,
+ 0 -> 17 [penwidth=2.0];
+ 1 -> 17 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
@@ -536,25 +536,26 @@
@ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug
|
x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug
- rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
$ html_output $TESTDIR/output/amend-obslog-patch-after.log obslog -G -r "typo" --patch
@ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug
|
x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug
- rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
- --- a/5d48a444aba7-changeset-description
- +++ b/708369dc1bfe-changeset-description
- @@ -1,1 +1,1 @@
- -Fx bug
- +Fix bug
+ rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ <span style="font-weight:bold;">diff -r 5d48a444aba7 -r 708369dc1bfe changeset-description</span>
+ <span style="font-weight:bold;color:red;">--- a/changeset-description</span>
+ <span style="font-weight:bold;color:green;">+++ b/changeset-description</span>
+ <span style="color:purple;">@@ -1,1 +1,1 @@</span>
+ <span style="color:red;">-Fx bug</span>
+ <span style="color:green;">+Fix bug</span>
$ html_output $TESTDIR/output/amend-obslog-all-after.log obslog --all -G -r "predecessors(typo)" --hidden
@ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug
|
x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug
- rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
Rebase
@@ -611,7 +612,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -621,7 +622,7 @@
shape=circle,
style=filled,
width=1];
- 2 [fillcolor="#7F7FFF",
+ 2 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/v2",
height=1,
@@ -631,8 +632,8 @@
shape=circle,
style=filled,
width=1];
- 0 -> 2 [penwidth=2.0];
- 3 [fillcolor="#7F7FFF",
+ 0 -> 2 [penwidth=2.0];
+ 3 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -642,8 +643,8 @@
shape=circle,
style=filled,
width=1];
- 2 -> 3 [penwidth=2.0];
- 6 [fillcolor="#7F7FFF",
+ 2 -> 3 [penwidth=2.0];
+ 6 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/v2",
height=1,
@@ -653,8 +654,8 @@
shape=circle,
style=filled,
width=1];
- 2 -> 6 [penwidth=2.0];
- 4 [fillcolor="#7F7FFF",
+ 2 -> 6 [penwidth=2.0];
+ 4 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -664,8 +665,8 @@
shape=circle,
style=filled,
width=1];
- 3 -> 4 [penwidth=2.0];
- 5 [fillcolor="#7F7FFF",
+ 3 -> 4 [penwidth=2.0];
+ 5 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -675,7 +676,7 @@
shape=circle,
style=filled,
width=1];
- 4 -> 5 [penwidth=2.0];
+ 4 -> 5 [penwidth=2.0];
}
Do the rebase
@@ -793,7 +794,7 @@
@ <span style="color:olive;">3d2c8a2356a2</span> <span style="color:blue;">(20)</span> Third commit on build/linuxsupport-v2
|
x <span style="color:olive;">39e9774ab30b</span> <span style="color:blue;">(5)</span> Third commit on build/linuxsupport-v2
- rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> using <span style="font-weight:bold;">rebase</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
$ graph $TESTDIR/graphs/rebase-after.dot -r '::desc(v2)' -T "{shortest(node, 8)}" --public=yes
Wrote */graphs/rebase-after.dot (glob)
@@ -804,7 +805,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -814,7 +815,7 @@
shape=circle,
style=filled,
width=1];
- 2 [fillcolor="#7F7FFF",
+ 2 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/v2",
height=1,
@@ -824,8 +825,8 @@
shape=circle,
style=filled,
width=1];
- 0 -> 2 [penwidth=2.0];
- 6 [fillcolor="#7F7FFF",
+ 0 -> 2 [penwidth=2.0];
+ 6 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/v2",
height=1,
@@ -835,8 +836,8 @@
shape=circle,
style=filled,
width=1];
- 2 -> 6 [penwidth=2.0];
- 18 [fillcolor="#7F7FFF",
+ 2 -> 6 [penwidth=2.0];
+ 18 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -846,8 +847,8 @@
shape=circle,
style=filled,
width=1];
- 6 -> 18 [penwidth=2.0];
- 19 [fillcolor="#7F7FFF",
+ 6 -> 18 [penwidth=2.0];
+ 19 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -857,8 +858,8 @@
shape=circle,
style=filled,
width=1];
- 18 -> 19 [penwidth=2.0];
- 20 [fillcolor="#7F7FFF",
+ 18 -> 19 [penwidth=2.0];
+ 20 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -868,7 +869,7 @@
shape=circle,
style=filled,
width=1];
- 19 -> 20 [penwidth=2.0];
+ 19 -> 20 [penwidth=2.0];
}
$ graph $TESTDIR/graphs/rebase-after-hidden.dot -r '::desc(v2)' -T "{shortest(node, 8)}" --hidden --public=yes
@@ -880,7 +881,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -890,7 +891,7 @@
shape=circle,
style=filled,
width=1];
- 2 [fillcolor="#7F7FFF",
+ 2 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/v2",
height=1,
@@ -900,8 +901,8 @@
shape=circle,
style=filled,
width=1];
- 0 -> 2 [penwidth=2.0];
- 3 [fillcolor="#DFDFFF",
+ 0 -> 2 [penwidth=2.0];
+ 3 [fillcolor="#DFDFFF",
fixedsize=true,
group="build/linuxsupport-v2_extinct",
height=1,
@@ -911,8 +912,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 2 -> 3 [penwidth=2.0];
- 6 [fillcolor="#7F7FFF",
+ 2 -> 3 [penwidth=2.0];
+ 6 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/v2",
height=1,
@@ -922,8 +923,8 @@
shape=circle,
style=filled,
width=1];
- 2 -> 6 [penwidth=2.0];
- 18 [fillcolor="#7F7FFF",
+ 2 -> 6 [penwidth=2.0];
+ 18 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -933,12 +934,12 @@
shape=circle,
style=filled,
width=1];
- 3 -> 18 [arrowtail=dot,
+ 3 -> 18 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 4 [fillcolor="#DFDFFF",
+ 4 [fillcolor="#DFDFFF",
fixedsize=true,
group="build/linuxsupport-v2_extinct",
height=1,
@@ -948,8 +949,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 3 -> 4 [penwidth=2.0];
- 19 [fillcolor="#7F7FFF",
+ 3 -> 4 [penwidth=2.0];
+ 19 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -959,13 +960,13 @@
shape=circle,
style=filled,
width=1];
- 18 -> 19 [penwidth=2.0];
- 4 -> 19 [arrowtail=dot,
+ 18 -> 19 [penwidth=2.0];
+ 4 -> 19 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 5 [fillcolor="#DFDFFF",
+ 5 [fillcolor="#DFDFFF",
fixedsize=true,
group="build/linuxsupport-v2_extinct",
height=1,
@@ -975,8 +976,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 4 -> 5 [penwidth=2.0];
- 20 [fillcolor="#7F7FFF",
+ 4 -> 5 [penwidth=2.0];
+ 20 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -986,13 +987,13 @@
shape=circle,
style=filled,
width=1];
- 19 -> 20 [penwidth=2.0];
- 5 -> 20 [arrowtail=dot,
+ 19 -> 20 [penwidth=2.0];
+ 5 -> 20 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 6 -> 18 [penwidth=2.0];
+ 6 -> 18 [penwidth=2.0];
}
Under the hood
@@ -1018,7 +1019,7 @@
XXX Remove the command line to avoid showing predecessors and hidden revset
- $ tail -n +2 $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log | tee $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log
+ $ tail -n +2 $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log | tee $TESTDIR/output/behind-the-hood-amend-before-hash-hidden-temp.log
x <span style="color:olive;">changeset: 1:5d48a444aba7</span>
| branch: typo
| user: Boris Feld <boris.feld@octobus.net>
@@ -1031,6 +1032,7 @@
date: Thu Dec 07 11:26:05 2017 +0100
summary: ROOT
+ $ mv $TESTDIR/output/behind-the-hood-amend-before-hash-hidden-temp.log $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log
$ html_output $TESTDIR/output/behind-the-hood-amend-after.log log -G -r "::typo"
o <span style="color:olive;">changeset: 17:708369dc1bfe</span>
@@ -1070,36 +1072,37 @@
o <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug
|
x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug
- rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
- --- a/5d48a444aba7-changeset-description
- +++ b/708369dc1bfe-changeset-description
- @@ -1,1 +1,1 @@
- -Fx bug
- +Fix bug
+ rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ <span style="font-weight:bold;">diff -r 5d48a444aba7 -r 708369dc1bfe changeset-description</span>
+ <span style="font-weight:bold;color:red;">--- a/changeset-description</span>
+ <span style="font-weight:bold;color:green;">+++ b/changeset-description</span>
+ <span style="color:purple;">@@ -1,1 +1,1 @@</span>
+ <span style="color:red;">-Fx bug</span>
+ <span style="color:green;">+Fix bug</span>
$ html_output $TESTDIR/output/under-the-hood-amend-after-obslog.log obslog -G -r typo
o <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug
|
x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug
- rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
$ html_output $TESTDIR/output/under-the-hood-amend-after-obslog-no-all.log obslog -G -r "5d48a444aba7" --hidden
x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug
- rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
$ html_output $TESTDIR/output/under-the-hood-amend-after-obslog-all.log obslog -G -r "5d48a444aba7" --hidden --all
o <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug
|
x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug
- rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
$ html_output $TESTDIR/output/under-the-hood-rebase-after-obslog.log obslog -r build/linuxsupport-v2
@ <span style="color:olive;">3d2c8a2356a2</span> <span style="color:blue;">(20)</span> Third commit on build/linuxsupport-v2
|
x <span style="color:olive;">39e9774ab30b</span> <span style="color:blue;">(5)</span> Third commit on build/linuxsupport-v2
- rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> using <span style="font-weight:bold;">rebase</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
$ html_output $TESTDIR/output/under-the-hood-rebase-after-obslog-branch.log obslog -r "branch('build/linuxsupport-v2')"
@ <span style="color:olive;">3d2c8a2356a2</span> <span style="color:blue;">(20)</span> Third commit on build/linuxsupport-v2
@@ -1109,13 +1112,13 @@
| | o <span style="color:olive;">7b62ce2c283e</span> <span style="color:blue;">(18)</span> First commit on build/linuxsupport-v2
| | |
x | | <span style="color:olive;">39e9774ab30b</span> <span style="color:blue;">(5)</span> Third commit on build/linuxsupport-v2
- / / rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ / / rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> using <span style="font-weight:bold;">rebase</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
| |
| x <span style="color:olive;">424916b62f4c</span> <span style="color:blue;">(3)</span> First commit on build/linuxsupport-v2
- | rewritten(parent) as <span style="color:olive;">7b62ce2c283e</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ | rewritten(parent) as <span style="color:olive;">7b62ce2c283e</span> using <span style="font-weight:bold;">rebase</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
|
x <span style="color:olive;">5ad93176b041</span> <span style="color:blue;">(4)</span> Second commit on build/linuxsupport-v2.
- rewritten(parent) as <span style="color:olive;">4686378320d7</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ rewritten(parent) as <span style="color:olive;">4686378320d7</span> using <span style="font-weight:bold;">rebase</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
@@ -1240,7 +1243,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -1250,7 +1253,7 @@
shape=circle,
style=filled,
width=1];
- 7 [fillcolor="#7F7FFF",
+ 7 [fillcolor="#7F7FFF",
fixedsize=true,
group="amend-extract",
height=1,
@@ -1260,8 +1263,8 @@
shape=circle,
style=filled,
width=1];
- 0 -> 7 [penwidth=2.0];
- 8 [fillcolor="#7F7FFF",
+ 0 -> 7 [penwidth=2.0];
+ 8 [fillcolor="#7F7FFF",
fixedsize=true,
group="amend-extract",
height=1,
@@ -1271,7 +1274,7 @@
shape=circle,
style=filled,
width=1];
- 7 -> 8 [penwidth=2.0];
+ 7 -> 8 [penwidth=2.0];
}
Amend User
@@ -1291,13 +1294,13 @@
Commit to be extracted
<span style="font-weight:bold;">diff -r 4ae0d1de7a58 -r 5935c1c3ad24 badfile</span>
- <span style="color:red;font-weight:bold;">--- /dev/null Thu Jan 01 00:00:00 1970 +0000</span>
- <span style="color:green;font-weight:bold;">+++ b/badfile Fri Dec 08 15:28:46 2017 +0100</span>
+ <span style="font-weight:bold;color:red;">--- /dev/null Thu Jan 01 00:00:00 1970 +0000</span>
+ <span style="font-weight:bold;color:green;">+++ b/badfile Fri Dec 08 15:28:46 2017 +0100</span>
<span style="color:purple;">@@ -0,0 +1,1 @@</span>
<span style="color:green;">+badbadfile</span>
<span style="font-weight:bold;">diff -r 4ae0d1de7a58 -r 5935c1c3ad24 fileextract</span>
- <span style="color:red;font-weight:bold;">--- a/fileextract Fri Dec 08 15:04:09 2017 +0100</span>
- <span style="color:green;font-weight:bold;">+++ b/fileextract Fri Dec 08 15:28:46 2017 +0100</span>
+ <span style="font-weight:bold;color:red;">--- a/fileextract Fri Dec 08 15:04:09 2017 +0100</span>
+ <span style="font-weight:bold;color:green;">+++ b/fileextract Fri Dec 08 15:28:46 2017 +0100</span>
<span style="color:purple;">@@ -1,5 +1,6 @@</span>
# The file dedicated to be extracted
@@ -1329,8 +1332,8 @@
Commit to be extracted
<span style="font-weight:bold;">diff -r 4ae0d1de7a58 -r 1e04751ef00a fileextract</span>
- <span style="color:red;font-weight:bold;">--- a/fileextract Fri Dec 08 15:04:09 2017 +0100</span>
- <span style="color:green;font-weight:bold;">+++ b/fileextract Fri Dec 08 15:28:46 2017 +0100</span>
+ <span style="font-weight:bold;color:red;">--- a/fileextract Fri Dec 08 15:04:09 2017 +0100</span>
+ <span style="font-weight:bold;color:green;">+++ b/fileextract Fri Dec 08 15:28:46 2017 +0100</span>
<span style="color:purple;">@@ -1,5 +1,6 @@</span>
# The file dedicated to be extracted
@@ -1346,7 +1349,7 @@
$ html_output $TESTDIR/output/amend-extract-badfile-after-status.log status
- <span style="color:green;font-weight:bold;">A </span><span style="color:green;font-weight:bold;">badfile</span>
+ <span style="font-weight:bold;color:green;">A </span><span style="font-weight:bold;color:green;">badfile</span>
$ html_output $TESTDIR/output/amend-extract-badfile-after-revert.log revert --all --no-backup
forgetting badfile
@@ -1362,7 +1365,8 @@
> EOF
<span style="font-weight:bold;">diff --git a/fileextract b/fileextract</span>
2 hunks, 2 lines changed
- <span style="color:olive;">examine changes to 'fileextract'? [Ynesfdaq?]</span> y
+ <span style="color:olive;">examine changes to 'fileextract'?</span>
+ <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> y
<span style="color:purple;">@@ -1,5 +1,6 @@</span>
# The file dedicated to be extracted
@@ -1371,7 +1375,8 @@
1
2
3
- <span style="color:olive;">discard change 1/2 to 'fileextract'? [Ynesfdaq?]</span> n
+ <span style="color:olive;">discard change 1/2 to 'fileextract'?</span>
+ <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> n
<span style="color:purple;">@@ -10,4 +11,5 @@</span>
8
@@ -1379,16 +1384,17 @@
10
<span style="color:green;">+42</span>
- <span style="color:olive;">discard change 2/2 to 'fileextract'? [Ynesfdaq?]</span> y
+ <span style="color:olive;">discard change 2/2 to 'fileextract'?</span>
+ <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> y
$ html_output $TESTDIR/output/amend-extract-after-status.log status
- <span style="color:blue;font-weight:bold;">M </span><span style="color:blue;font-weight:bold;">fileextract</span>
+ <span style="font-weight:bold;color:blue;">M </span><span style="font-weight:bold;color:blue;">fileextract</span>
$ html_output $TESTDIR/output/amend-extract-after-diff.log diff
<span style="font-weight:bold;">diff -r 76ace846a3f9 fileextract</span>
- <span style="color:red;font-weight:bold;">--- a/fileextract Fri Dec 08 15:28:46 2017 +0100</span>
- <span style="color:green;font-weight:bold;">+++ b/fileextract Thu Jan 01 00:00:00 1970 +0000</span>
+ <span style="font-weight:bold;color:red;">--- a/fileextract Fri Dec 08 15:28:46 2017 +0100</span>
+ <span style="font-weight:bold;color:green;">+++ b/fileextract Thu Jan 01 00:00:00 1970 +0000</span>
<span style="color:purple;">@@ -11,4 +11,5 @@</span>
8
9
@@ -1403,29 +1409,29 @@
@ <span style="color:olive;">76ace846a3f9</span> <span style="color:blue;">(24)</span> Commit to be extracted
|
x <span style="color:olive;">1e04751ef00a</span> <span style="color:blue;">(22)</span> Commit to be extracted
- | rewritten(content) as <span style="color:olive;">76ace846a3f9</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
- | diff -r 1e04751ef00a -r 76ace846a3f9 fileextract
- | --- a/fileextract Fri Dec 08 15:28:46 2017 +0100
- | +++ b/fileextract Fri Dec 08 15:28:46 2017 +0100
- | @@ -11,5 +11,4 @@
+ | rewritten(content) as <span style="color:olive;">76ace846a3f9</span> using <span style="font-weight:bold;">uncommit</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ | <span style="font-weight:bold;">diff -r 1e04751ef00a -r 76ace846a3f9 fileextract</span>
+ | <span style="font-weight:bold;color:red;">--- a/fileextract Fri Dec 08 15:28:46 2017 +0100</span>
+ | <span style="font-weight:bold;color:green;">+++ b/fileextract Fri Dec 08 15:28:46 2017 +0100</span>
+ | <span style="color:purple;">@@ -11,5 +11,4 @@</span>
| 8
| 9
| 10
- | -42
+ | <span style="color:red;">-42</span>
|
|
|
x <span style="color:olive;">5935c1c3ad24</span> <span style="color:blue;">(21)</span> Commit to be extracted
- | rewritten(content) as <span style="color:olive;">1e04751ef00a</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
- | diff -r 5935c1c3ad24 -r 1e04751ef00a badfile
- | --- a/badfile Fri Dec 08 15:28:46 2017 +0100
- | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
- | @@ -1,1 +0,0 @@
- | -badbadfile
+ | rewritten(content) as <span style="color:olive;">1e04751ef00a</span> using <span style="font-weight:bold;">uncommit</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ | <span style="font-weight:bold;">diff -r 5935c1c3ad24 -r 1e04751ef00a badfile</span>
+ | <span style="font-weight:bold;color:red;">--- a/badfile Fri Dec 08 15:28:46 2017 +0100</span>
+ | <span style="font-weight:bold;color:green;">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000</span>
+ | <span style="color:purple;">@@ -1,1 +0,0 @@</span>
+ | <span style="color:red;">-badbadfile</span>
|
|
x <span style="color:olive;">e288d12d5e96</span> <span style="color:blue;">(8)</span> Commit to be extracted
- rewritten(user) as <span style="color:olive;">5935c1c3ad24</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ rewritten(user) as <span style="color:olive;">5935c1c3ad24</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
$ graph $TESTDIR/graphs/amend-extract-after-hidden.dot -r "::desc(extracted)" -T "{shortest(node, 8)}" --hidden --public=yes
@@ -1437,7 +1443,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -1447,7 +1453,7 @@
shape=circle,
style=filled,
width=1];
- 7 [fillcolor="#7F7FFF",
+ 7 [fillcolor="#7F7FFF",
fixedsize=true,
group="amend-extract",
height=1,
@@ -1457,8 +1463,8 @@
shape=circle,
style=filled,
width=1];
- 0 -> 7 [penwidth=2.0];
- 8 [fillcolor="#DFDFFF",
+ 0 -> 7 [penwidth=2.0];
+ 8 [fillcolor="#DFDFFF",
fixedsize=true,
group="amend-extract_extinct",
height=1,
@@ -1468,8 +1474,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 7 -> 8 [penwidth=2.0];
- 21 [fillcolor="#DFDFFF",
+ 7 -> 8 [penwidth=2.0];
+ 21 [fillcolor="#DFDFFF",
fixedsize=true,
group="amend-extract_extinct",
height=1,
@@ -1479,8 +1485,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 7 -> 21 [penwidth=2.0];
- 22 [fillcolor="#DFDFFF",
+ 7 -> 21 [penwidth=2.0];
+ 22 [fillcolor="#DFDFFF",
fixedsize=true,
group="amend-extract_extinct",
height=1,
@@ -1490,8 +1496,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 7 -> 22 [penwidth=2.0];
- 24 [fillcolor="#7F7FFF",
+ 7 -> 22 [penwidth=2.0];
+ 24 [fillcolor="#7F7FFF",
fixedsize=true,
group="amend-extract",
height=1,
@@ -1501,18 +1507,18 @@
shape=circle,
style=filled,
width=1];
- 7 -> 24 [penwidth=2.0];
- 8 -> 21 [arrowtail=dot,
+ 7 -> 24 [penwidth=2.0];
+ 8 -> 21 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 21 -> 22 [arrowtail=dot,
+ 21 -> 22 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 22 -> 24 [arrowtail=dot,
+ 22 -> 24 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
@@ -1535,8 +1541,8 @@
| summary: Really fix the test
|
| <span style="font-weight:bold;">diff -r b316dc02bddc -r 966df9f031c1 test/unit</span>
- | <span style="color:red;font-weight:bold;">--- a/test/unit Fri Dec 08 16:50:17 2017 +0100</span>
- | <span style="color:green;font-weight:bold;">+++ b/test/unit Fri Dec 08 16:50:38 2017 +0100</span>
+ | <span style="font-weight:bold;color:red;">--- a/test/unit Fri Dec 08 16:50:17 2017 +0100</span>
+ | <span style="font-weight:bold;color:green;">+++ b/test/unit Fri Dec 08 16:50:38 2017 +0100</span>
| <span style="color:purple;">@@ -1,1 +1,1 @@</span>
| <span style="color:red;">-assert 42 = 43</span>
| <span style="color:green;">+assert 42 = 42</span>
@@ -1548,8 +1554,8 @@
| summary: Fix the test
|
| <span style="font-weight:bold;">diff -r 03174536bb2a -r b316dc02bddc test/unit</span>
- | <span style="color:red;font-weight:bold;">--- a/test/unit Fri Dec 08 16:49:45 2017 +0100</span>
- | <span style="color:green;font-weight:bold;">+++ b/test/unit Fri Dec 08 16:50:17 2017 +0100</span>
+ | <span style="font-weight:bold;color:red;">--- a/test/unit Fri Dec 08 16:49:45 2017 +0100</span>
+ | <span style="font-weight:bold;color:green;">+++ b/test/unit Fri Dec 08 16:50:17 2017 +0100</span>
| <span style="color:purple;">@@ -1,1 +1,1 @@</span>
| <span style="color:red;">-assert 42 = 0</span>
| <span style="color:green;">+assert 42 = 43</span>
@@ -1562,8 +1568,8 @@
summary: add a test
<span style="font-weight:bold;">diff -r d2eb2ac6a5bd -r 03174536bb2a test/unit</span>
- <span style="color:red;font-weight:bold;">--- /dev/null Thu Jan 01 00:00:00 1970 +0000</span>
- <span style="color:green;font-weight:bold;">+++ b/test/unit Fri Dec 08 16:49:45 2017 +0100</span>
+ <span style="font-weight:bold;color:red;">--- /dev/null Thu Jan 01 00:00:00 1970 +0000</span>
+ <span style="font-weight:bold;color:green;">+++ b/test/unit Fri Dec 08 16:49:45 2017 +0100</span>
<span style="color:purple;">@@ -0,0 +1,1 @@</span>
<span style="color:green;">+assert 42 = 0</span>
@@ -1577,7 +1583,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -1587,7 +1593,7 @@
shape=circle,
style=filled,
width=1];
- 10 [fillcolor="#7F7FFF",
+ 10 [fillcolor="#7F7FFF",
fixedsize=true,
group=fold,
height=1,
@@ -1597,8 +1603,8 @@
shape=circle,
style=filled,
width=1];
- 0 -> 10 [penwidth=2.0];
- 11 [fillcolor="#7F7FFF",
+ 0 -> 10 [penwidth=2.0];
+ 11 [fillcolor="#7F7FFF",
fixedsize=true,
group=fold,
height=1,
@@ -1608,8 +1614,8 @@
shape=circle,
style=filled,
width=1];
- 10 -> 11 [penwidth=2.0];
- 12 [fillcolor="#7F7FFF",
+ 10 -> 11 [penwidth=2.0];
+ 12 [fillcolor="#7F7FFF",
fixedsize=true,
group=fold,
height=1,
@@ -1619,7 +1625,7 @@
shape=circle,
style=filled,
width=1];
- 11 -> 12 [penwidth=2.0];
+ 11 -> 12 [penwidth=2.0];
}
$ html_output $TESTDIR/output/fold.log fold --from -r "branch(fold)" -m "add a test"
@@ -1654,14 +1660,14 @@
| | branch: fold
| | user: Boris Feld <boris.feld@octobus.net>
| | date: Fri Dec 08 16:50:38 2017 +0100
- | | obsolete: rewritten as 25:dab6ed4b3c75
+ | | obsolete: rewritten using fold as 25:dab6ed4b3c75
| | summary: Really fix the test
| |
| x <span style="color:olive;">changeset: 11:b316dc02bddc</span>
| | branch: fold
| | user: Boris Feld <boris.feld@octobus.net>
| | date: Fri Dec 08 16:50:17 2017 +0100
- | | obsolete: rewritten as 25:dab6ed4b3c75
+ | | obsolete: rewritten using fold as 25:dab6ed4b3c75
| | summary: Fix the test
| |
| x <span style="color:olive;">changeset: 10:03174536bb2a</span>
@@ -1669,7 +1675,7 @@
| parent: 0:d2eb2ac6a5bd
| user: Boris Feld <boris.feld@octobus.net>
| date: Fri Dec 08 16:49:45 2017 +0100
- | obsolete: rewritten as 25:dab6ed4b3c75
+ | obsolete: rewritten using fold as 25:dab6ed4b3c75
| summary: add a test
|
o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span>
@@ -1684,13 +1690,13 @@
| \
| |\
x | | <span style="color:olive;">03174536bb2a</span> <span style="color:blue;">(10)</span> add a test
- / / rewritten(date, content) as <span style="color:olive;">dab6ed4b3c75</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ / / rewritten(date, content) as <span style="color:olive;">dab6ed4b3c75</span> using <span style="font-weight:bold;">fold</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
| |
x | <span style="color:olive;">966df9f031c1</span> <span style="color:blue;">(12)</span> Really fix the test
- / rewritten(description, date, parent, content) as <span style="color:olive;">dab6ed4b3c75</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ / rewritten(description, date, parent, content) as <span style="color:olive;">dab6ed4b3c75</span> using <span style="font-weight:bold;">fold</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
|
x <span style="color:olive;">b316dc02bddc</span> <span style="color:blue;">(11)</span> Fix the test
- rewritten(description, date, parent, content) as <span style="color:olive;">dab6ed4b3c75</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ rewritten(description, date, parent, content) as <span style="color:olive;">dab6ed4b3c75</span> using <span style="font-weight:bold;">fold</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
$ graph $TESTDIR/graphs/fold-after-hidden.log -r "::branch(fold)" -T "{shortest(node, 8)}" --hidden --public=yes
@@ -1702,7 +1708,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -1712,7 +1718,7 @@
shape=circle,
style=filled,
width=1];
- 10 [fillcolor="#DFDFFF",
+ 10 [fillcolor="#DFDFFF",
fixedsize=true,
group=fold_extinct,
height=1,
@@ -1722,8 +1728,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 0 -> 10 [penwidth=2.0];
- 25 [fillcolor="#7F7FFF",
+ 0 -> 10 [penwidth=2.0];
+ 25 [fillcolor="#7F7FFF",
fixedsize=true,
group=fold,
height=1,
@@ -1733,13 +1739,13 @@
shape=circle,
style=filled,
width=1];
- 0 -> 25 [penwidth=2.0];
- 10 -> 25 [arrowtail=dot,
+ 0 -> 25 [penwidth=2.0];
+ 10 -> 25 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 11 [fillcolor="#DFDFFF",
+ 11 [fillcolor="#DFDFFF",
fixedsize=true,
group=fold_extinct,
height=1,
@@ -1749,13 +1755,13 @@
shape=circle,
style="dotted, filled",
width=1];
- 10 -> 11 [penwidth=2.0];
- 11 -> 25 [arrowtail=dot,
+ 10 -> 11 [penwidth=2.0];
+ 11 -> 25 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 12 [fillcolor="#DFDFFF",
+ 12 [fillcolor="#DFDFFF",
fixedsize=true,
group=fold_extinct,
height=1,
@@ -1765,8 +1771,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 11 -> 12 [penwidth=2.0];
- 12 -> 25 [arrowtail=dot,
+ 11 -> 12 [penwidth=2.0];
+ 12 -> 25 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
@@ -1801,7 +1807,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -1811,7 +1817,7 @@
shape=circle,
style=filled,
width=1];
- 13 [fillcolor="#7F7FFF",
+ 13 [fillcolor="#7F7FFF",
fixedsize=true,
group=split,
height=1,
@@ -1821,7 +1827,7 @@
shape=circle,
style=filled,
width=1];
- 0 -> 13 [penwidth=2.0];
+ 0 -> 13 [penwidth=2.0];
}
@@ -1840,31 +1846,38 @@
adding src/B
adding src/C
<span style="font-weight:bold;">diff --git a/src/A b/src/A</span>
- <span style="color:teal;font-weight:bold;">new file mode 100644</span>
- <span style="color:olive;">examine changes to 'src/A'? [Ynesfdaq?]</span> Y
+ <span style="font-weight:bold;color:teal;">new file mode 100644</span>
+ <span style="color:olive;">examine changes to 'src/A'?</span>
+ <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> Y
<span style="font-weight:bold;">diff --git a/src/B b/src/B</span>
- <span style="color:teal;font-weight:bold;">new file mode 100644</span>
- <span style="color:olive;">examine changes to 'src/B'? [Ynesfdaq?]</span> N
+ <span style="font-weight:bold;color:teal;">new file mode 100644</span>
+ <span style="color:olive;">examine changes to 'src/B'?</span>
+ <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> N
<span style="font-weight:bold;">diff --git a/src/C b/src/C</span>
- <span style="color:teal;font-weight:bold;">new file mode 100644</span>
- <span style="color:olive;">examine changes to 'src/C'? [Ynesfdaq?]</span> N
+ <span style="font-weight:bold;color:teal;">new file mode 100644</span>
+ <span style="color:olive;">examine changes to 'src/C'?</span>
+ <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> N
created new head
- <span style="color:olive;">Done splitting? [yN]</span> N
+ (consider using topic for lightweight branches. See 'hg help topic')
+ <span style="color:olive;">continue splitting? [Ycdq?]</span> N
<span style="font-weight:bold;">diff --git a/src/B b/src/B</span>
- <span style="color:teal;font-weight:bold;">new file mode 100644</span>
- <span style="color:olive;">examine changes to 'src/B'? [Ynesfdaq?]</span> Y
+ <span style="font-weight:bold;color:teal;">new file mode 100644</span>
+ <span style="color:olive;">examine changes to 'src/B'?</span>
+ <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> Y
<span style="font-weight:bold;">diff --git a/src/C b/src/C</span>
- <span style="color:teal;font-weight:bold;">new file mode 100644</span>
- <span style="color:olive;">examine changes to 'src/C'? [Ynesfdaq?]</span> N
+ <span style="font-weight:bold;color:teal;">new file mode 100644</span>
+ <span style="color:olive;">examine changes to 'src/C'?</span>
+ <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> N
- <span style="color:olive;">Done splitting? [yN]</span> N
+ <span style="color:olive;">continue splitting? [Ycdq?]</span> N
<span style="font-weight:bold;">diff --git a/src/C b/src/C</span>
- <span style="color:teal;font-weight:bold;">new file mode 100644</span>
- <span style="color:olive;">examine changes to 'src/C'? [Ynesfdaq?]</span> Y
+ <span style="font-weight:bold;color:teal;">new file mode 100644</span>
+ <span style="color:olive;">examine changes to 'src/C'?</span>
+ <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> Y
no more change to split
@@ -1903,7 +1916,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -1913,7 +1926,7 @@
shape=circle,
style=filled,
width=1];
- 13 [fillcolor="#DFDFFF",
+ 13 [fillcolor="#DFDFFF",
fixedsize=true,
group=split_extinct,
height=1,
@@ -1923,8 +1936,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 0 -> 13 [penwidth=2.0];
- 26 [fillcolor="#7F7FFF",
+ 0 -> 13 [penwidth=2.0];
+ 26 [fillcolor="#7F7FFF",
fixedsize=true,
group=split,
height=1,
@@ -1934,13 +1947,13 @@
shape=circle,
style=filled,
width=1];
- 0 -> 26 [penwidth=2.0];
- 13 -> 26 [arrowtail=dot,
+ 0 -> 26 [penwidth=2.0];
+ 13 -> 26 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 27 [fillcolor="#7F7FFF",
+ 27 [fillcolor="#7F7FFF",
fixedsize=true,
group=split,
height=1,
@@ -1950,12 +1963,12 @@
shape=circle,
style=filled,
width=1];
- 13 -> 27 [arrowtail=dot,
+ 13 -> 27 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 28 [fillcolor="#7F7FFF",
+ 28 [fillcolor="#7F7FFF",
fixedsize=true,
group=split,
height=1,
@@ -1965,20 +1978,20 @@
shape=circle,
style=filled,
width=1];
- 13 -> 28 [arrowtail=dot,
+ 13 -> 28 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 26 -> 27 [penwidth=2.0];
- 27 -> 28 [penwidth=2.0];
+ 26 -> 27 [penwidth=2.0];
+ 27 -> 28 [penwidth=2.0];
}
$ html_output $TESTDIR/output/split-after-obslog.log obslog -r .
@ <span style="color:olive;">1b7281b1e052</span> <span style="color:blue;">(28)</span> To be splitted
|
x <span style="color:olive;">5d5029b9daed</span> <span style="color:blue;">(13)</span> To be splitted
- rewritten(date, parent, content) as <span style="color:olive;">1b7281b1e052, 59f0ddc4bd4b, 6fb7bfb44ffe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ rewritten(date, parent, content) as <span style="color:olive;">1b7281b1e052, 59f0ddc4bd4b, 6fb7bfb44ffe</span> using <span style="font-weight:bold;">split</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
$ html_output $TESTDIR/output/split-after-obslog-all.log obslog --all -r .
@ <span style="color:olive;">1b7281b1e052</span> <span style="color:blue;">(28)</span> To be splitted
@@ -1988,7 +2001,7 @@
| o <span style="color:olive;">6fb7bfb44ffe</span> <span style="color:blue;">(27)</span> To be splitted
|/
x <span style="color:olive;">5d5029b9daed</span> <span style="color:blue;">(13)</span> To be splitted
- rewritten(date, parent, content) as <span style="color:olive;">1b7281b1e052, 59f0ddc4bd4b, 6fb7bfb44ffe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ rewritten(date, parent, content) as <span style="color:olive;">1b7281b1e052, 59f0ddc4bd4b, 6fb7bfb44ffe</span> using <span style="font-weight:bold;">split</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
$ html_output $TESTDIR/output/split-after-log-phase.log log -G -r "::split" --template "{rev} {phase}\n"
@ 28 draft
@@ -2035,7 +2048,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -2045,7 +2058,7 @@
shape=circle,
style=filled,
width=1];
- 9 [fillcolor="#7F7FFF",
+ 9 [fillcolor="#7F7FFF",
fixedsize=true,
group=prune,
height=1,
@@ -2055,16 +2068,16 @@
shape=circle,
style=filled,
width=1];
- 0 -> 9 [penwidth=2.0];
+ 0 -> 9 [penwidth=2.0];
}
$ html_output $TESTDIR/output/prune.log prune -r .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- working directory now at <span style="color:olive;">d2eb2ac6a5bd</span>
+ working directory is now at <span style="color:olive;">d2eb2ac6a5bd</span>
1 changesets pruned
$ html_output $TESTDIR/output/prune-after.log log -G -r "::prune"
- abort: unknown revision 'prune'!
+ <span style="color:red;">abort: unknown revision 'prune'!</span>
$ html_output $TESTDIR/output/prune-after-hidden.log log -G -r "::prune" --hidden
x <span style="color:olive;">changeset: 9:324b72ebbb21</span>
@@ -2072,7 +2085,7 @@
| parent: 0:d2eb2ac6a5bd
| user: Boris Feld <boris.feld@octobus.net>
| date: Fri Dec 08 16:12:23 2017 +0100
- | obsolete: pruned
+ | obsolete: pruned using prune
| summary: Commit to prune
|
@ <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span>
@@ -2083,7 +2096,7 @@
$ html_output $TESTDIR/output/prune-after-obslog.log obslog -r "prune" --hidden
x <span style="color:olive;">324b72ebbb21</span> <span style="color:blue;">(9)</span> Commit to prune
- pruned by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
+ pruned using <span style="font-weight:bold;">prune</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span>
$ graph $TESTDIR/graphs/prune-after-hidden.dot -r '::prune' -T "{shortest(node, 8)}" --hidden --public=yes
Wrote */graphs/prune-after-hidden.dot (glob)
@@ -2094,7 +2107,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -2104,7 +2117,7 @@
shape=circle,
style=filled,
width=1];
- 9 [fillcolor="#DFDFFF",
+ 9 [fillcolor="#DFDFFF",
fixedsize=true,
group=prune_extinct,
height=1,
@@ -2114,7 +2127,7 @@
shape=circle,
style="dotted, filled",
width=1];
- 0 -> 9 [penwidth=2.0];
+ 0 -> 9 [penwidth=2.0];
}
Histedit
@@ -2157,7 +2170,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -2167,7 +2180,7 @@
shape=circle,
style=filled,
width=1];
- 14 [fillcolor="#7F7FFF",
+ 14 [fillcolor="#7F7FFF",
fixedsize=true,
group=histedit,
height=1,
@@ -2177,8 +2190,8 @@
shape=circle,
style=filled,
width=1];
- 0 -> 14 [penwidth=2.0];
- 15 [fillcolor="#7F7FFF",
+ 0 -> 14 [penwidth=2.0];
+ 15 [fillcolor="#7F7FFF",
fixedsize=true,
group=histedit,
height=1,
@@ -2188,8 +2201,8 @@
shape=circle,
style=filled,
width=1];
- 14 -> 15 [penwidth=2.0];
- 16 [fillcolor="#7F7FFF",
+ 14 -> 15 [penwidth=2.0];
+ 16 [fillcolor="#7F7FFF",
fixedsize=true,
group=histedit,
height=1,
@@ -2199,7 +2212,7 @@
shape=circle,
style=filled,
width=1];
- 15 -> 16 [penwidth=2.0];
+ 15 -> 16 [penwidth=2.0];
}
$ HGEDITOR=cat html_output $TESTDIR/output/histedit-no-edit.log histedit -r ".~1"
@@ -2313,7 +2326,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -2323,7 +2336,7 @@
shape=circle,
style=filled,
width=1];
- 14 [fillcolor="#7F7FFF",
+ 14 [fillcolor="#7F7FFF",
fixedsize=true,
group=histedit,
height=1,
@@ -2333,8 +2346,8 @@
shape=circle,
style=filled,
width=1];
- 0 -> 14 [penwidth=2.0];
- 15 [fillcolor="#DFDFFF",
+ 0 -> 14 [penwidth=2.0];
+ 15 [fillcolor="#DFDFFF",
fixedsize=true,
group=histedit_extinct,
height=1,
@@ -2344,8 +2357,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 14 -> 15 [penwidth=2.0];
- 29 [fillcolor="#7F7FFF",
+ 14 -> 15 [penwidth=2.0];
+ 29 [fillcolor="#7F7FFF",
fixedsize=true,
group=histedit,
height=1,
@@ -2355,8 +2368,8 @@
shape=circle,
style=filled,
width=1];
- 14 -> 29 [penwidth=2.0];
- 30 [fillcolor="#7F7FFF",
+ 14 -> 29 [penwidth=2.0];
+ 30 [fillcolor="#7F7FFF",
fixedsize=true,
group=histedit,
height=1,
@@ -2366,12 +2379,12 @@
shape=circle,
style=filled,
width=1];
- 15 -> 30 [arrowtail=dot,
+ 15 -> 30 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 16 [fillcolor="#DFDFFF",
+ 16 [fillcolor="#DFDFFF",
fixedsize=true,
group=histedit_extinct,
height=1,
@@ -2381,13 +2394,13 @@
shape=circle,
style="dotted, filled",
width=1];
- 15 -> 16 [penwidth=2.0];
- 16 -> 29 [arrowtail=dot,
+ 15 -> 16 [penwidth=2.0];
+ 16 -> 29 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 29 -> 30 [penwidth=2.0];
+ 29 -> 30 [penwidth=2.0];
}
Stack
@@ -2398,18 +2411,18 @@
$ html_output $TESTDIR/output/stack-typo.log stack
### target: typo (branch)
- <span style="color:teal;">b1</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Fix bug</span><span style="color:teal;font-weight:bold;"> (current)</span>
- b0^ ROOT (base)
+ <span style="color:teal;">s1</span><span style="font-weight:bold;color:teal;">@</span> <span style="color:teal;">Fix bug</span><span style="font-weight:bold;color:teal;"> (current)</span>
+ s0^ ROOT (base)
$ hg update build/linuxsupport-v2
4 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ html_output $TESTDIR/output/stack-rebase.log stack
### target: build/linuxsupport-v2 (branch)
- <span style="color:teal;">b3</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Third commit on build/linuxsupport-v2</span><span style="color:teal;font-weight:bold;"> (current)</span>
- <span style="color:olive;">b2</span><span style="color:green;">:</span> Second commit on build/linuxsupport-v2.
- <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2
- b0^ New commit on build/v2 (base)
+ <span style="color:teal;">s3</span><span style="font-weight:bold;color:teal;">@</span> <span style="color:teal;">Third commit on build/linuxsupport-v2</span><span style="font-weight:bold;color:teal;"> (current)</span>
+ <span style="color:olive;">s2</span><span style="color:green;">:</span> Second commit on build/linuxsupport-v2.
+ <span style="color:olive;">s1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2
+ s0^ New commit on build/v2 (base)
$ html_output $TESTDIR/output/stack-rebase-prev-from-b3.log prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -2417,16 +2430,16 @@
$ html_output $TESTDIR/output/stack-rebase-stack-b2.log stack
### target: build/linuxsupport-v2 (branch)
- <span style="color:olive;">b3</span><span style="color:green;">:</span> Third commit on build/linuxsupport-v2
- <span style="color:teal;">b2</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2.</span><span style="color:teal;font-weight:bold;"> (current)</span>
- <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2
- b0^ New commit on build/v2 (base)
+ <span style="color:olive;">s3</span><span style="color:green;">:</span> Third commit on build/linuxsupport-v2
+ <span style="color:teal;">s2</span><span style="font-weight:bold;color:teal;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2.</span><span style="font-weight:bold;color:teal;"> (current)</span>
+ <span style="color:olive;">s1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2
+ s0^ New commit on build/v2 (base)
$ html_output $TESTDIR/output/stack-rebase-next-from-b2.log next
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[<span style="color:blue;">20</span>] Third commit on build/linuxsupport-v2
- $ html_output $TESTDIR/output/stack-rebase-export-b1.log export -r b1
+ $ html_output $TESTDIR/output/stack-rebase-export-b1.log export -r s1
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1512661592 -3600
@@ -2436,15 +2449,15 @@
# Parent 0e694460372ee8e9ca759c90f05a31f11eee34ac
First commit on build/linuxsupport-v2
- $ html_output $TESTDIR/output/stack-rebase-update-b2.log update -r b2
+ $ html_output $TESTDIR/output/stack-rebase-update-b2.log update -r s2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ html_output $TESTDIR/output/stack-rebase-stack-b2.log stack
### target: build/linuxsupport-v2 (branch)
- <span style="color:olive;">b3</span><span style="color:green;">:</span> Third commit on build/linuxsupport-v2
- <span style="color:teal;">b2</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2.</span><span style="color:teal;font-weight:bold;"> (current)</span>
- <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2
- b0^ New commit on build/v2 (base)
+ <span style="color:olive;">s3</span><span style="color:green;">:</span> Third commit on build/linuxsupport-v2
+ <span style="color:teal;">s2</span><span style="font-weight:bold;color:teal;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2.</span><span style="font-weight:bold;color:teal;"> (current)</span>
+ <span style="color:olive;">s1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2
+ s0^ New commit on build/v2 (base)
Edit mid-stack
@@ -2455,10 +2468,10 @@
$ html_output $TESTDIR/output/edit-mid-stack-after-stack.log stack
### target: build/linuxsupport-v2 (branch)
- <span style="color:olive;">b3</span><span style="color:red;">$</span> Third commit on build/linuxsupport-v2<span style="color:red;"> (orphan)</span>
- <span style="color:teal;">b2</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2</span><span style="color:teal;font-weight:bold;"> (current)</span>
- <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2
- b0^ New commit on build/v2 (base)
+ <span style="color:olive;">s3</span><span style="color:red;">$</span> Third commit on build/linuxsupport-v2<span style="color:red;"> (orphan)</span>
+ <span style="color:teal;">s2</span><span style="font-weight:bold;color:teal;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2</span><span style="font-weight:bold;color:teal;"> (current)</span>
+ <span style="color:olive;">s1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2
+ s0^ New commit on build/v2 (base)
$ html_output $TESTDIR/output/edit-mid-stack-after-log.log log -r "branch(build/linuxsupport-v2)" -G
@ <span style="color:olive;">changeset: 31:5c069dd03e05</span>
@@ -2469,7 +2482,7 @@
| date: Mon Dec 11 11:20:24 2017 +0100
| summary: Second commit on build/linuxsupport-v2
|
- | o <span style="color:olive;">changeset: 20:3d2c8a2356a2</span>
+ | * <span style="color:olive;">changeset: 20:3d2c8a2356a2</span>
| | branch: build/linuxsupport-v2
| | user: Boris Feld <boris.feld@octobus.net>
| | date: Mon Dec 11 11:21:02 2017 +0100
@@ -2500,7 +2513,7 @@
splines=polyline
];
node [label="\N"];
- 18 [fillcolor="#7F7FFF",
+ 18 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -2510,7 +2523,7 @@
shape=circle,
style=filled,
width=1];
- 19 [fillcolor="#DFDFFF",
+ 19 [fillcolor="#DFDFFF",
fixedsize=true,
group="build/linuxsupport-v2_alt",
height=1,
@@ -2520,8 +2533,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 18 -> 19 [penwidth=2.0];
- 31 [fillcolor="#7F7FFF",
+ 18 -> 19 [penwidth=2.0];
+ 31 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -2531,13 +2544,13 @@
shape=circle,
style=filled,
width=1];
- 18 -> 31 [penwidth=2.0];
- 19 -> 31 [arrowtail=dot,
+ 18 -> 31 [penwidth=2.0];
+ 19 -> 31 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 20 [fillcolor="#FF4F4F",
+ 20 [fillcolor="#FF4F4F",
fixedsize=true,
group="build/linuxsupport-v2_alt",
height=1,
@@ -2547,7 +2560,7 @@
shape=circle,
style=filled,
width=1];
- 19 -> 20 [penwidth=2.0];
+ 19 -> 20 [penwidth=2.0];
}
Basic instability + stabilization
@@ -2558,7 +2571,7 @@
$ html_output $TESTDIR/output/basic-stabilize-before-log-obsolete.log log -r "branch(build/linuxsupport-v2)" -G -T "{node|short}: {obsolete}\n"
@ 5c069dd03e05:
|
- | o 3d2c8a2356a2:
+ | * 3d2c8a2356a2:
| |
| x 4686378320d7: obsolete
|/
@@ -2569,7 +2582,7 @@
$ html_output $TESTDIR/output/basic-stabilize-before-log-instabilities.log log -r "branch(build/linuxsupport-v2)" -G -T "{node|short}: {instabilities}\n"
@ 5c069dd03e05:
|
- | o 3d2c8a2356a2: orphan
+ | * 3d2c8a2356a2: orphan
| |
| x 4686378320d7:
|/
@@ -2582,16 +2595,16 @@
orphan: 4686378320d7 (obsolete parent)
$ html_output $TESTDIR/output/basic-stabilize-next-evolve.log next --evolve
- move:[<span style="color:blue;">20</span>] Third commit on build/linuxsupport-v2
+ <span style="font-weight:bold;">move:</span>[<span style="color:blue;">20</span>] Third commit on build/linuxsupport-v2
atop:[<span style="color:blue;">31</span>] Second commit on build/linuxsupport-v2
- working directory now at <span style="color:olive;">52e790f9d4c3</span>
+ working directory is now at <span style="color:olive;">52e790f9d4c3</span>
$ html_output $TESTDIR/output/basic-stabilize-after-stack.log stack
### target: build/linuxsupport-v2 (branch)
- <span style="color:teal;">b3</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Third commit on build/linuxsupport-v2</span><span style="color:teal;font-weight:bold;"> (current)</span>
- <span style="color:olive;">b2</span><span style="color:green;">:</span> Second commit on build/linuxsupport-v2
- <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2
- b0^ New commit on build/v2 (base)
+ <span style="color:teal;">s3</span><span style="font-weight:bold;color:teal;">@</span> <span style="color:teal;">Third commit on build/linuxsupport-v2</span><span style="font-weight:bold;color:teal;"> (current)</span>
+ <span style="color:olive;">s2</span><span style="color:green;">:</span> Second commit on build/linuxsupport-v2
+ <span style="color:olive;">s1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2
+ s0^ New commit on build/v2 (base)
$ graph $TESTDIR/graphs/basic-stabilize-after-stack.dot -T "{shortest(node, 8)}" -r "(::. + ::predecessors(.)) and branch(build/linuxsupport-v2)" --hidden --public=yes
Wrote */graphs/basic-stabilize-after-stack.dot (glob)
@@ -2602,7 +2615,7 @@
splines=polyline
];
node [label="\N"];
- 18 [fillcolor="#7F7FFF",
+ 18 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -2612,7 +2625,7 @@
shape=circle,
style=filled,
width=1];
- 31 [fillcolor="#7F7FFF",
+ 31 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -2622,8 +2635,8 @@
shape=circle,
style=filled,
width=1];
- 18 -> 31 [penwidth=2.0];
- 19 [fillcolor="#DFDFFF",
+ 18 -> 31 [penwidth=2.0];
+ 19 [fillcolor="#DFDFFF",
fixedsize=true,
group="build/linuxsupport-v2_extinct",
height=1,
@@ -2633,8 +2646,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 18 -> 19 [penwidth=2.0];
- 32 [fillcolor="#7F7FFF",
+ 18 -> 19 [penwidth=2.0];
+ 32 [fillcolor="#7F7FFF",
fixedsize=true,
group="build/linuxsupport-v2",
height=1,
@@ -2644,13 +2657,13 @@
shape=circle,
style=filled,
width=1];
- 31 -> 32 [penwidth=2.0];
- 19 -> 31 [arrowtail=dot,
+ 31 -> 32 [penwidth=2.0];
+ 19 -> 31 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
style=dashed];
- 20 [fillcolor="#DFDFFF",
+ 20 [fillcolor="#DFDFFF",
fixedsize=true,
group="build/linuxsupport-v2_extinct",
height=1,
@@ -2660,8 +2673,8 @@
shape=circle,
style="dotted, filled",
width=1];
- 19 -> 20 [penwidth=2.0];
- 20 -> 32 [arrowtail=dot,
+ 19 -> 20 [penwidth=2.0];
+ 20 -> 32 [arrowtail=dot,
dir=back,
minlen=0,
penwidth=2.0,
@@ -2856,7 +2869,7 @@
| | | | parent: 7:4ae0d1de7a58
| | | | user: Good User
| | | | date: Fri Dec 08 15:28:46 2017 +0100
- | | | | obsolete: pruned
+ | | | | obsolete: pruned using uncommit
| | | | summary: temporary commit for uncommiting 1e04751ef00a
| | | |
| | | | x changeset: 22:1e04751ef00a
@@ -2864,7 +2877,7 @@
| | | | parent: 7:4ae0d1de7a58
| | | | user: Good User
| | | | date: Fri Dec 08 15:28:46 2017 +0100
- | | | | obsolete: amended as 24:76ace846a3f9
+ | | | | obsolete: amended using uncommit as 24:76ace846a3f9
| | | | summary: Commit to be extracted
| | | |
| | | | x changeset: 21:5935c1c3ad24
@@ -2872,14 +2885,14 @@
| | | | parent: 7:4ae0d1de7a58
| | | | user: Good User
| | | | date: Fri Dec 08 15:28:46 2017 +0100
- | | | | obsolete: amended as 22:1e04751ef00a
+ | | | | obsolete: amended using uncommit as 22:1e04751ef00a
| | | | summary: Commit to be extracted
| | | |
| | | | x changeset: 20:3d2c8a2356a2
| | | | | branch: build/linuxsupport-v2
| | | | | user: Boris Feld <boris.feld@octobus.net>
| | | | | date: Mon Dec 11 11:21:02 2017 +0100
- | | | | | obsolete: rebased as 32:52e790f9d4c3
+ | | | | | obsolete: rebased using evolve as 32:52e790f9d4c3
| | | | | summary: Third commit on build/linuxsupport-v2
| | | | |
+-------x changeset: 19:4686378320d7
@@ -2929,21 +2942,21 @@
| | | parent: 0:d2eb2ac6a5bd
| | | user: Boris Feld <boris.feld@octobus.net>
| | | date: Fri Dec 08 17:33:15 2017 +0100
- | | | obsolete: split as 26:59f0ddc4bd4b, 27:6fb7bfb44ffe, 28:1b7281b1e052
+ | | | obsolete: split using split as 26:59f0ddc4bd4b, 27:6fb7bfb44ffe, 28:1b7281b1e052
| | | summary: To be splitted
| | |
| | | x changeset: 12:966df9f031c1
| | | | branch: fold
| | | | user: Boris Feld <boris.feld@octobus.net>
| | | | date: Fri Dec 08 16:50:38 2017 +0100
- | | | | obsolete: rewritten as 25:dab6ed4b3c75
+ | | | | obsolete: rewritten using fold as 25:dab6ed4b3c75
| | | | summary: Really fix the test
| | | |
| | | x changeset: 11:b316dc02bddc
| | | | branch: fold
| | | | user: Boris Feld <boris.feld@octobus.net>
| | | | date: Fri Dec 08 16:50:17 2017 +0100
- | | | | obsolete: rewritten as 25:dab6ed4b3c75
+ | | | | obsolete: rewritten using fold as 25:dab6ed4b3c75
| | | | summary: Fix the test
| | | |
| +---x changeset: 10:03174536bb2a
@@ -2951,7 +2964,7 @@
| | | parent: 0:d2eb2ac6a5bd
| | | user: Boris Feld <boris.feld@octobus.net>
| | | date: Fri Dec 08 16:49:45 2017 +0100
- | | | obsolete: rewritten as 25:dab6ed4b3c75
+ | | | obsolete: rewritten using fold as 25:dab6ed4b3c75
| | | summary: add a test
| | |
| +---x changeset: 9:324b72ebbb21
@@ -2959,7 +2972,7 @@
| | | parent: 0:d2eb2ac6a5bd
| | | user: Boris Feld <boris.feld@octobus.net>
| | | date: Fri Dec 08 16:12:23 2017 +0100
- | | | obsolete: pruned
+ | | | obsolete: pruned using prune
| | | summary: Commit to prune
| | |
| | | x changeset: 8:e288d12d5e96
@@ -3052,7 +3065,7 @@
splines=polyline
];
node [label="\N"];
- 0 [fillcolor="#7F7FFF",
+ 0 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -3062,7 +3075,7 @@
shape=circle,
style=filled,
width=1];
- 1 [fillcolor="#7F7FFF",
+ 1 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -3072,8 +3085,8 @@
shape=pentagon,
style=filled,
width=1];
- 0 -> 1 [penwidth=2.0];
- 2 [fillcolor="#7F7FFF",
+ 0 -> 1 [penwidth=2.0];
+ 2 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -3083,5 +3096,5 @@
shape=square,
style=filled,
width=1];
- 1 -> 2 [penwidth=2.0];
+ 1 -> 2 [penwidth=2.0];
}