Commit e8660b28 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

obslog: makes --origin flag the default

Test change have been carefully validated.
parent a9f9edb168a1
......@@ -59,7 +59,7 @@
(b'a', b'all', False, _(b'show all related changesets, not only precursors')),
(b'p', b'patch', False, _(b'show the patch between two obs versions')),
(b'f', b'filternonlocal', False, _(b'filter out non local commits')),
(b'o', b'origin', False, _(b'show origin of changesets instead of fate')),
(b'o', b'origin', True, _(b'show origin of changesets instead of fate')),
] + commands.formatteropts,
_(b'hg olog [OPTION]... [[-r] REV]...'),
**compat.helpcategorykwargs('CATEGORY_CHANGE_NAVIGATION'))
......
......@@ -88,5 +88,13 @@
f7ad4196431346de3c33c52e75374fba45e04313 af624b221c0c0bec5d74e2650180dd3eddcb7c42 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
$ hg obslog -p -r .
@ af624b221c0c (1) added a
| amended(content) from f7ad41964313 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| diff --git a/a b/a
| --- a/a
| +++ b/a
| @@ -1,1 +1,1 @@
| -foo
| +Gello
|
|
x f7ad41964313 (0) added a
......@@ -91,13 +99,5 @@
|
x f7ad41964313 (0) added a
amended(content) as af624b221c0c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-foo
+Gello
Diff and status are good too
$ hg diff
......
......@@ -21,10 +21,10 @@
$ hg amend -d '0 0' -n "this a note on the obsmarker and supported for hg>=4.4"
$ hg debugobsolete
07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob)
$ hg obslog
$ hg obslog --no-origin
@ 6a022cbb61d5 (1) adda
|
x 07f494440405 (0) adda
branch-changed(branch) as 6a022cbb61d5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
note: this a note on the obsmarker and supported for hg>=4.4
......@@ -25,9 +25,16 @@
@ 6a022cbb61d5 (1) adda
|
x 07f494440405 (0) adda
branch-changed(branch) as 6a022cbb61d5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
note: this a note on the obsmarker and supported for hg>=4.4
$ hg obslog
@ 6a022cbb61d5 (1) adda
| branch-changed(branch) from 07f494440405 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| note: this a note on the obsmarker and supported for hg>=4.4
|
x 07f494440405 (0) adda
$ hg branch
foo
$ hg branches
......
......@@ -900,5 +900,29 @@
4a250e5bd992a897655e3b6f238e12452cf063e9 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
$ hg obslog --all --patch
* 084ae625fa51 (2) E2
| rewritten(description, content) from 4a250e5bd992 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 4a250e5bd992 -r 084ae625fa51 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
| @@ -1,1 +1,1 @@
| -E1
| +E2
|
| diff --git a/numbers b/numbers
| --- a/numbers
| +++ b/numbers
| @@ -4,1 +4,1 @@
| -four
| +4
| @@ -7,1 +7,1 @@
| -7
| +seven
| diff --git a/romans b/romans
| --- a/romans
| +++ b/romans
| @@ -6,1 +6,1 @@
| -VI
| +vi
|
|
| @ 19ed1bf64a2c (3) E3
......@@ -903,4 +927,31 @@
|
| @ 19ed1bf64a2c (3) E3
|/
|/ rewritten(description, content) from 4a250e5bd992 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 4a250e5bd992 -r 19ed1bf64a2c changeset-description
| --- a/changeset-description
| +++ b/changeset-description
| @@ -1,1 +1,1 @@
| -E1
| +E3
|
| diff --git a/letters b/letters
| --- a/letters
| +++ b/letters
| @@ -4,1 +4,1 @@
| -D
| +d
| diff --git a/numbers b/numbers
| --- a/numbers
| +++ b/numbers
| @@ -1,1 +1,1 @@
| -1
| +one
| diff --git a/romans b/romans
| --- a/romans
| +++ b/romans
| @@ -2,1 +2,1 @@
| -II
| +ii
|
|
x 4a250e5bd992 (1) E1
......@@ -906,55 +957,4 @@
x 4a250e5bd992 (1) E1
rewritten(description, content) as 084ae625fa51 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 4a250e5bd992 -r 084ae625fa51 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1,1 +1,1 @@
-E1
+E2
diff --git a/numbers b/numbers
--- a/numbers
+++ b/numbers
@@ -4,1 +4,1 @@
-four
+4
@@ -7,1 +7,1 @@
-7
+seven
diff --git a/romans b/romans
--- a/romans
+++ b/romans
@@ -6,1 +6,1 @@
-VI
+vi
rewritten(description, content) as 19ed1bf64a2c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 4a250e5bd992 -r 19ed1bf64a2c changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1,1 +1,1 @@
-E1
+E3
diff --git a/letters b/letters
--- a/letters
+++ b/letters
@@ -4,1 +4,1 @@
-D
+d
diff --git a/numbers b/numbers
--- a/numbers
+++ b/numbers
@@ -1,1 +1,1 @@
-1
+one
diff --git a/romans b/romans
--- a/romans
+++ b/romans
@@ -2,1 +2,1 @@
-II
+ii
$ hg evolve --content-divergent --rev 'desc("E3")'
......@@ -1007,5 +1007,16 @@
e7cb08a7241a98c908db298b61fc033b27f648c7 50bb00cad3206c79d231a621e319772302a88d8d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
$ hg obslog --patch
@ 50bb00cad320 (5) E4
| reworded(description) from e7cb08a7241a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r e7cb08a7241a -r 50bb00cad320 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
| @@ -1,4 +1,1 @@
| -<<<<<<< divergent
| -E2||||||| base
| -E1=======
| -E3>>>>>>> other
| +E4
|
|
x e7cb08a7241a (4) <<<<<<< divergent
......@@ -1010,19 +1021,6 @@
|
x e7cb08a7241a (4) <<<<<<< divergent
|\ reworded(description) as 50bb00cad320 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| | diff -r e7cb08a7241a -r 50bb00cad320 changeset-description
| | --- a/changeset-description
| | +++ b/changeset-description
| | @@ -1,4 +1,1 @@
| | -<<<<<<< divergent
| | -E2||||||| base
| | -E1=======
| | -E3>>>>>>> other
| | +E4
| |
| |
x | 084ae625fa51 (2) E2
| | rewritten(description, content) as e7cb08a7241a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|\ rewritten(description, content) from 084ae625fa51 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | diff -r 084ae625fa51 -r e7cb08a7241a changeset-description
| | --- a/changeset-description
| | +++ b/changeset-description
......@@ -1052,5 +1050,58 @@
| | -II
| | +ii
| |
| | rewritten(description, content) from 19ed1bf64a2c using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | diff -r 19ed1bf64a2c -r e7cb08a7241a changeset-description
| | --- a/changeset-description
| | +++ b/changeset-description
| | @@ -1,1 +1,4 @@
| | -E3
| | +<<<<<<< divergent
| | +E2||||||| base
| | +E1=======
| | +E3>>>>>>> other
| |
| | diff --git a/numbers b/numbers
| | --- a/numbers
| | +++ b/numbers
| | @@ -4,1 +4,1 @@
| | -four
| | +4
| | @@ -7,1 +7,1 @@
| | -7
| | +seven
| | diff --git a/romans b/romans
| | --- a/romans
| | +++ b/romans
| | @@ -6,1 +6,1 @@
| | -VI
| | +vi
| |
| |
x | 084ae625fa51 (2) E2
| | rewritten(description, content) from 4a250e5bd992 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| | diff -r 4a250e5bd992 -r 084ae625fa51 changeset-description
| | --- a/changeset-description
| | +++ b/changeset-description
| | @@ -1,1 +1,1 @@
| | -E1
| | +E2
| |
| | diff --git a/numbers b/numbers
| | --- a/numbers
| | +++ b/numbers
| | @@ -4,1 +4,1 @@
| | -four
| | +4
| | @@ -7,1 +7,1 @@
| | -7
| | +seven
| | diff --git a/romans b/romans
| | --- a/romans
| | +++ b/romans
| | @@ -6,1 +6,1 @@
| | -VI
| | +vi
| |
| |
| x 19ed1bf64a2c (3) E3
......@@ -1055,6 +1106,6 @@
| |
| x 19ed1bf64a2c (3) E3
|/ rewritten(description, content) as e7cb08a7241a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 19ed1bf64a2c -r e7cb08a7241a changeset-description
|/ rewritten(description, content) from 4a250e5bd992 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 4a250e5bd992 -r 19ed1bf64a2c changeset-description
| --- a/changeset-description
| +++ b/changeset-description
......@@ -1059,9 +1110,6 @@
| --- a/changeset-description
| +++ b/changeset-description
| @@ -1,1 +1,4 @@
| -E3
| +<<<<<<< divergent
| +E2||||||| base
| +E1=======
| +E3>>>>>>> other
| @@ -1,1 +1,1 @@
| -E1
| +E3
|
......@@ -1067,4 +1115,10 @@
|
| diff --git a/letters b/letters
| --- a/letters
| +++ b/letters
| @@ -4,1 +4,1 @@
| -D
| +d
| diff --git a/numbers b/numbers
| --- a/numbers
| +++ b/numbers
......@@ -1068,12 +1122,9 @@
| diff --git a/numbers b/numbers
| --- a/numbers
| +++ b/numbers
| @@ -4,1 +4,1 @@
| -four
| +4
| @@ -7,1 +7,1 @@
| -7
| +seven
| @@ -1,1 +1,1 @@
| -1
| +one
| diff --git a/romans b/romans
| --- a/romans
| +++ b/romans
......@@ -1077,9 +1128,9 @@
| diff --git a/romans b/romans
| --- a/romans
| +++ b/romans
| @@ -6,1 +6,1 @@
| -VI
| +vi
| @@ -2,1 +2,1 @@
| -II
| +ii
|
|
x 4a250e5bd992 (1) E1
......@@ -1083,11 +1134,4 @@
|
|
x 4a250e5bd992 (1) E1
rewritten(description, content) as 084ae625fa51 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 4a250e5bd992 -r 084ae625fa51 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1,1 +1,1 @@
-E1
+E2
......@@ -1093,45 +1137,2 @@
diff --git a/numbers b/numbers
--- a/numbers
+++ b/numbers
@@ -4,1 +4,1 @@
-four
+4
@@ -7,1 +7,1 @@
-7
+seven
diff --git a/romans b/romans
--- a/romans
+++ b/romans
@@ -6,1 +6,1 @@
-VI
+vi
rewritten(description, content) as 19ed1bf64a2c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 4a250e5bd992 -r 19ed1bf64a2c changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -1,1 +1,1 @@
-E1
+E3
diff --git a/letters b/letters
--- a/letters
+++ b/letters
@@ -4,1 +4,1 @@
-D
+d
diff --git a/numbers b/numbers
--- a/numbers
+++ b/numbers
@@ -1,1 +1,1 @@
-1
+one
diff --git a/romans b/romans
--- a/romans
+++ b/romans
@@ -2,1 +2,1 @@
-II
+ii
......@@ -92,5 +92,7 @@
8374d2ddc3a4d48428c3d2f80e4fc86f13736f96 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
@ 98ab969ac8fb (4) divergent
|\
|\ amended(content) from 593c57f2117e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | amended(content) from 8374d2ddc3a4 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 593c57f2117e (2) divergent
......@@ -96,4 +98,4 @@
x | 593c57f2117e (2) divergent
| | amended(content) as 98ab969ac8fb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | rewritten(description, content) from 5f6d8a4bf34a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 8374d2ddc3a4 (3) divergent
......@@ -98,5 +100,5 @@
| |
| x 8374d2ddc3a4 (3) divergent
|/ amended(content) as 98ab969ac8fb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|/ rewritten(description, content) from 5f6d8a4bf34a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 5f6d8a4bf34a (1) added b
......@@ -101,7 +103,5 @@
|
x 5f6d8a4bf34a (1) added b
rewritten(description, content) as 593c57f2117e using prune by test (Thu Jan 01 00:00:00 1970 +0000)
rewritten(description, content) as 8374d2ddc3a4 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
Test divergence resolution when it yields to an empty commit (issue4950)
......@@ -177,5 +177,7 @@
b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49 6b3776664a258aa4c7e13f90df20ae9170995217 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
@ 6b3776664a25 (8) add cdivergent1
|\
|\ reworded(description) from b2ae71172042 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | rewritten from e3ff64ce8d4c using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | b2ae71172042 (7) add _c
......@@ -181,4 +183,4 @@
x | b2ae71172042 (7) add _c
| | reworded(description) as 6b3776664a25 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | amended(content) from 48819a835615 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x e3ff64ce8d4c (6) add cdivergent1
......@@ -183,5 +185,5 @@
| |
| x e3ff64ce8d4c (6) add cdivergent1
|/ rewritten as 6b3776664a25 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|/ rewritten(description, content) from 48819a835615 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 48819a835615 (5) add _c
......@@ -186,7 +188,5 @@
|
x 48819a835615 (5) add _c
amended(content) as b2ae71172042 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
rewritten(description, content) as e3ff64ce8d4c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
$ cd ..
......@@ -268,5 +268,7 @@
6b096fb450709a194b21fb9b192fe9b1572c4af0 b87e0354d5cb081210298429d8b51de9871155a2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
@ b87e0354d5cb (4) bdivergent
|\
|\ amended(content) from 05a6b6a9e633 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | amended(content) from 6b096fb45070 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 05a6b6a9e633 (2) bdivergent
......@@ -272,4 +274,4 @@
x | 05a6b6a9e633 (2) bdivergent
| | amended(content) as b87e0354d5cb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | rewritten(description, content) from 37445b16603b using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 6b096fb45070 (3) bdivergent
......@@ -274,5 +276,5 @@
| |
| x 6b096fb45070 (3) bdivergent
|/ amended(content) as b87e0354d5cb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|/ rewritten(description, content) from 37445b16603b using prune by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 37445b16603b (1) add _b
......@@ -277,7 +279,5 @@
|
x 37445b16603b (1) add _b
rewritten(description, content) as 05a6b6a9e633 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
rewritten(description, content) as 6b096fb45070 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
$ cd ..
......@@ -373,5 +373,7 @@
a2465d1d56d1aee8ed90d2292978456d2be6f7b9 51ee71efed6170064a7155a9a35e56af0292a203 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
@ 51ee71efed61 (9) updated e
|\
|\ amended(content) from 0ceb21ca2557 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | rewritten from a2465d1d56d1 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 0ceb21ca2557 (7) updated e
......@@ -377,4 +379,4 @@
x | 0ceb21ca2557 (7) updated e
| | amended(content) as 51ee71efed61 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | rebased(parent) from ff6f7cd76a7c using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x a2465d1d56d1 (8) updated e
......@@ -379,5 +381,5 @@
| |
| x a2465d1d56d1 (8) updated e
| | rewritten as 51ee71efed61 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | rebased(parent) from de4ea3103326 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x de4ea3103326 (6) updated e
......@@ -382,5 +384,5 @@
| |
| x de4ea3103326 (6) updated e
| | rebased(parent) as a2465d1d56d1 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | rewritten(description, parent, content) from 8d71eadcc9df using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | ff6f7cd76a7c (5) updated e
......@@ -385,5 +387,5 @@
| |
x | ff6f7cd76a7c (5) updated e
|/ rebased(parent) as 0ceb21ca2557 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|/ rewritten(description, content) from 8d71eadcc9df using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 8d71eadcc9df (4) added e
......@@ -388,7 +390,5 @@
|
x 8d71eadcc9df (4) added e
rewritten(description, parent, content) as de4ea3103326 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
rewritten(description, content) as ff6f7cd76a7c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
$ cd ..
......@@ -463,5 +463,7 @@
92ecd58f9b05d6c0a1c3833a79359eea4b0268ff b1badc7ab394c2b9ed21e2961de43c71c2e2288f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
@ b1badc7ab394 (4) delete a
|\
|\ amended(content) from 0825dcee2670 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | amended(content) from 92ecd58f9b05 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 0825dcee2670 (2) delete a
......@@ -467,4 +469,4 @@
x | 0825dcee2670 (2) delete a
| | amended(content) as b1badc7ab394 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | amended(content) from dff6e52f5e41 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 92ecd58f9b05 (3) delete a
......@@ -469,5 +471,5 @@
| |
| x 92ecd58f9b05 (3) delete a
|/ amended(content) as b1badc7ab394 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|/ amended(content) from dff6e52f5e41 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
x dff6e52f5e41 (1) delete a
......@@ -472,5 +474,3 @@
|
x dff6e52f5e41 (1) delete a
amended(content) as 0825dcee2670 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
amended(content) as 92ecd58f9b05 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
......@@ -237,5 +237,6 @@
$ hg obslog -r . --all
* 2ba73e31f264 (8) added c
| amended(content) from ca1b80f7960a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
| @ 491e10505bae (10) added c
......@@ -240,4 +241,5 @@
|
| @ 491e10505bae (10) added c
| | amended(content) from 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 7398f702a162 (9) added c
......@@ -242,5 +244,5 @@
| |
| x 7398f702a162 (9) added c
|/ amended(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|/ amended(content) from ca1b80f7960a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
x ca1b80f7960a (3) added c
......@@ -245,7 +247,5 @@
|
x ca1b80f7960a (3) added c
amended(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
amended(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
$ cd ..
......
......@@ -109,5 +109,7 @@
11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --all
@ e7fdc662d630 (8) added b
|\
|\ amended(content) from 11f849d7159f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | rewritten from 7ed0642d644b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 11f849d7159f (7) added b
......@@ -113,4 +115,4 @@
x | 11f849d7159f (7) added b
| | amended(content) as e7fdc662d630 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | rebased(parent) from da4b96f4a8d6 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 7ed0642d644b (5) added b
......@@ -115,5 +117,5 @@
| |
| x 7ed0642d644b (5) added b
| | rewritten as e7fdc662d630 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | amended(content) from b1661037fa25 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | da4b96f4a8d6 (6) added b
......@@ -118,5 +120,5 @@
| |
x | da4b96f4a8d6 (6) added b
|/ rebased(parent) as 11f849d7159f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|/ rebased(parent) from b1661037fa25 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
|
x b1661037fa25 (2) added b