Commit 55e9987b authored by Anton Shestakov's avatar Anton Shestakov
Browse files

test-compat: merge mercurial-4.8 into mercurial-4.7

# no-check-commit
Pipeline #27761 passed with stage
in 10 minutes and 4 seconds
......@@ -27,7 +27,8 @@
script:
- *prepare_hg
- ("$PYTHON" --version)
- (cd tests; set -x; HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" /ci/repos/mercurial/tests/run-tests.py --color=always $RUNTEST_ARGS)
- jobs=$(python -c 'import multiprocessing; print multiprocessing.cpu_count()')
- (cd tests; set -x; HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" /ci/repos/mercurial/tests/run-tests.py -j $jobs --color=always $RUNTEST_ARGS)
checks-py2:
<<: *runtests
......
......@@ -52,7 +52,7 @@
checking manifests
crosschecking files in changesets and manifests
checking files
checked 3 changesets with 13 changes to 13 files
13 files, 3 changesets, 13 total revisions
$ mkcommit D
$ mkcommit E
$ hg up -q .^^
......@@ -107,7 +107,7 @@
checking manifests
crosschecking files in changesets and manifests
checking files
checked 4 changesets with 15 changes to 15 files
15 files, 4 changesets, 15 total revisions
......@@ -33,7 +33,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
new changesets 1e4be0697311:8aaa48160adc (2 drafts)
new changesets 1e4be0697311:8aaa48160adc
(run 'hg update' to get a working copy)
$ hg -R ../client log -G
o 1 8aaa48160adc A0 tip
......@@ -63,7 +63,7 @@
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
obsoleted 1 changesets
new changesets f6082bc4ffef (1 drafts)
new changesets f6082bc4ffef
(run 'hg heads' to see heads)
$ hg -R ../client log -G
o 2 f6082bc4ffef A1 tip
......@@ -92,7 +92,7 @@
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
obsoleted 1 changesets
new changesets c1f8d089020f (1 drafts)
new changesets c1f8d089020f
(run 'hg heads' to see heads)
$ hg -R ../client log -G
o 3 c1f8d089020f A2 tip
......
......@@ -297,7 +297,7 @@
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending hello command (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending between command (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: * (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: 1 (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending protocaps command (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 1; heads (glob)
......
......@@ -375,8 +375,7 @@
with: [6] updated e
base: [4] added e
rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 5f6d8a4bf34a
file 'd' was deleted in local but was modified in other.
What do you want to do?
other changed d which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
working directory is now at 050a5d9ba60d
......
......@@ -663,4 +663,5 @@
The other side of the divergence gets amended so it matches upstream.
Relocation (onto upstream) will therefore result in no changes to commit.
$ hg revert -r 'desc("upstream")' --all
reverting a
removing b
......@@ -666,5 +667,4 @@
removing b
reverting a
$ hg amend --config experimental.evolution.allowdivergence=True
2 new content-divergent changesets
......
......@@ -47,7 +47,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files
new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
new changesets 8fa14d15e168:c41c793e0ef1
(run 'hg update' to get a working copy)
$ hg glog
o 4:c41c793e0ef1 added d
......@@ -117,7 +117,7 @@
added 4 changesets with 0 changes to 4 files (+1 heads)
5 new obsolescence markers
8 new content-divergent changesets
new changesets 82b74d5dc678:15c781f93cac (4 drafts)
new changesets 82b74d5dc678:15c781f93cac
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg glog
......@@ -370,7 +370,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files
new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
new changesets 8fa14d15e168:c41c793e0ef1
(run 'hg update' to get a working copy)
$ hg glog
......@@ -444,7 +444,7 @@
added 5 changesets with 1 changes to 5 files (+1 heads)
4 new obsolescence markers
8 new content-divergent changesets
new changesets 2228e3b74514:d45f050514c2 (5 drafts)
new changesets 2228e3b74514:d45f050514c2
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg glog
......@@ -1092,7 +1092,7 @@
added 4 changesets with 1 changes to 5 files (+1 heads)
3 new obsolescence markers
6 new content-divergent changesets
new changesets 9703820a7d5b:9a1f460df8b5 (4 drafts)
new changesets 9703820a7d5b:9a1f460df8b5
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg glog
* 10:9a1f460df8b5 added dar
......
......@@ -56,7 +56,7 @@
| | parent: 1:471f378eab4c
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | obsolete: folded using fold as 4:eb5a0daa2192
| | obsolete: rewritten using fold as 4:eb5a0daa2192
| | summary: B1
| |
| | x changeset: 2:0dec01379d3b
......@@ -68,7 +68,7 @@
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| obsolete: folded using fold as 4:eb5a0daa2192
| obsolete: rewritten using fold as 4:eb5a0daa2192
| summary: A0
|
o changeset: 0:ea207398892e
......@@ -84,7 +84,7 @@
@ eb5a0daa2192 (4) C0
|\
x | 471f378eab4c (1) A0
/ folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
/ rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
......@@ -100,7 +100,7 @@
|
|
x b7ea6d14e664 (3) B1
| folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 0dec01379d3b (2) B0
......@@ -115,8 +115,22 @@
$ hg obslog eb5a0daa2192 --patch
@ eb5a0daa2192 (4) C0
|\ folded(description, parent, content) from 471f378eab4c, b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | (No patch available, too many predecessors (2))
|\ rewritten(description, content) from 471f378eab4c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
| | --- a/changeset-description
| | +++ b/changeset-description
| | @@ -1,1 +1,1 @@
| | -A0
| | +C0
| |
| | diff -r 471f378eab4c -r eb5a0daa2192 B0
| | --- /dev/null Thu Jan 01 00:00:00 1970 +0000
| | +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
| | @@ -0,0 +1,1 @@
| | +B0
| |
| | rewritten(description, parent, content) from b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | (No patch available, changesets rebased)
| |
x | 471f378eab4c (1) A0
/
......@@ -137,7 +151,7 @@
@ eb5a0daa2192 (4) C0
|\
x | 471f378eab4c (1) A0
/ folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
/ rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
......@@ -153,7 +167,7 @@
|
|
x b7ea6d14e664 (3) B1
| folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 0dec01379d3b (2) B0
......@@ -168,8 +182,22 @@
$ hg obslog 1 --hidden --all --patch
@ eb5a0daa2192 (4) C0
|\ folded(description, parent, content) from 471f378eab4c, b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | (No patch available, too many predecessors (2))
|\ rewritten(description, content) from 471f378eab4c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
| | --- a/changeset-description
| | +++ b/changeset-description
| | @@ -1,1 +1,1 @@
| | -A0
| | +C0
| |
| | diff -r 471f378eab4c -r eb5a0daa2192 B0
| | --- /dev/null Thu Jan 01 00:00:00 1970 +0000
| | +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
| | @@ -0,0 +1,1 @@
| | +B0
| |
| | rewritten(description, parent, content) from b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | (No patch available, changesets rebased)
| |
x | 471f378eab4c (1) A0
/
......@@ -215,7 +243,7 @@
"users": [
"test"
],
"verb": "folded"
"verb": "rewritten"
}
],
"node": "b7ea6d14e664bdc8922221f7992631b50da3fb07",
......@@ -270,7 +298,7 @@
"users": [
"test"
],
"verb": "folded"
"verb": "rewritten"
}
],
"node": "471f378eab4c5e25f6c77f785b27c936efb22874",
......@@ -286,7 +314,25 @@
[
*, (glob)
0
],
]
],
"effects": [
"description",
"content"
],
"operations": [
"fold"
],
"prednodes": [
"471f378eab4c5e25f6c77f785b27c936efb22874"
],
"users": [
"test"
],
"verb": "rewritten"
},
{
"dates": [
[
*, (glob)
0
......@@ -301,9 +347,8 @@
"fold"
],
"prednodes": [
"471f378eab4c5e25f6c77f785b27c936efb22874",
"b7ea6d14e664bdc8922221f7992631b50da3fb07"
],
"users": [
"test"
],
......@@ -305,9 +350,9 @@
"b7ea6d14e664bdc8922221f7992631b50da3fb07"
],
"users": [
"test"
],
"verb": "folded"
"verb": "rewritten"
}
],
"node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0",
......
......@@ -5,12 +5,6 @@
$ . $TESTDIR/testlib/obshistory_setup.sh
$ cat >> $HGRCPATH << EOF
> [templates]
> logdates = '{ifeq(min(dates), max(dates), "at {max(dates)|hgdate}", "between {min(dates)|hgdate} and {max(dates)|hgdate}")}'
> logmarkers = '{if(markers, join(markers % "{logdates} by {users} "))}'
> EOF
Test output on amended commit
=============================
......@@ -133,8 +127,8 @@
x 471f378eab4c A0
$ hg obslog 4ae3a4151de9 --graph --no-origin -T '{desc|firstline} {logmarkers}'
$ hg obslog 4ae3a4151de9 --graph --no-origin -T'{label("log.summary", desc|firstline)} {if(markers, join(markers % "at {date|hgdate} by {users} ", " also "))}'
@ A1
|
x A0 at 0 0 by test
......@@ -137,11 +131,11 @@
@ A1
|
x A0 at 0 0 by test
$ hg obslog 4ae3a4151de9 --graph -T '{desc|firstline} {logmarkers}'
$ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", desc|firstline)} {if(markers, join(markers % "at {date|hgdate} by {users} ", " also "))}'
@ A1 at 0 0 by test
|
x A0
Check that the same thing works with the old {shortdescription} form
......@@ -142,11 +136,11 @@
@ A1 at 0 0 by test
|
x A0
Check that the same thing works with the old {shortdescription} form
$ hg obslog 4ae3a4151de9 --graph --no-origin -T '{shortdescription} {logmarkers}'
$ hg obslog 4ae3a4151de9 --graph --no-origin -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {users} ", " also "))}'
@ A1
|
x A0 at 0 0 by test
......@@ -149,8 +143,8 @@
@ A1
|
x A0 at 0 0 by test
$ hg obslog 4ae3a4151de9 --graph -T '{shortdescription} {logmarkers}'
$ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {users} ", " also "))}'
@ A1 at 0 0 by test
|
x A0
......
......@@ -70,7 +70,9 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg obslog -r .
@ 100cc25b765f (9) fold2
|\ folded(description, parent, content) from 0da815c333f6, d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
|\ rewritten(description, content) from 0da815c333f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | note: folding changesets to test
| | rewritten(description, parent, content) from d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | note: folding changesets to test
| |
x | 0da815c333f6 (5) E
......@@ -102,9 +104,9 @@
x | | changeset: 4:868d2e0eb19c
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
| | | obsolete: folded using fold as 8:d15d0ffc75f6
| | | obsolete: rewritten using fold as 8:d15d0ffc75f6
| | | summary: D
| | |
x | | changeset: 3:a8df460dbbfe
|/ / user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
......@@ -106,11 +108,11 @@
| | | summary: D
| | |
x | | changeset: 3:a8df460dbbfe
|/ / user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | obsolete: folded using fold as 8:d15d0ffc75f6
| | obsolete: rewritten using fold as 8:d15d0ffc75f6
| | summary: C
| |
x | changeset: 2:c473644ee0e9
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
......@@ -112,11 +114,11 @@
| | summary: C
| |
x | changeset: 2:c473644ee0e9
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | obsolete: folded using fold as 7:b868bc49b0a4
| | obsolete: rewritten using fold as 7:b868bc49b0a4
| | summary: B
| |
x | changeset: 1:2a34000d3544
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
......@@ -118,9 +120,9 @@
| | summary: B
| |
x | changeset: 1:2a34000d3544
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| obsolete: folded using fold as 7:b868bc49b0a4
| obsolete: rewritten using fold as 7:b868bc49b0a4
| summary: A
|
o changeset: 0:ea207398892e
......@@ -381,7 +383,8 @@
| | rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | d15d0ffc75f6 (8) fold1
|\ \ folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000)
|\ \ rewritten(description, parent, content) from 868d2e0eb19c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | | rewritten(description, content) from a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | |
| | x e036916b63ea (11) fold0
| | | split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000)
......@@ -391,7 +394,8 @@
x / a8df460dbbfe (3) C
/
x b868bc49b0a4 (7) fold0
|\ folded(description, parent, content) from 2a34000d3544, c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
|\ rewritten(description, content) from 2a34000d3544 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | rewritten(description, parent, content) from c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 2a34000d3544 (1) A
/
......@@ -408,6 +412,6 @@
| | | rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | |
x | | 868d2e0eb19c (4) D
/ / folded(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
/ / rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | a8df460dbbfe (3) C
......@@ -412,8 +416,8 @@
| |
x | a8df460dbbfe (3) C
/ folded(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
/ rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
|
x b868bc49b0a4 (7) fold0
|\ split(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 2a34000d3544 (1) A
......@@ -415,8 +419,8 @@
|
x b868bc49b0a4 (7) fold0
|\ split(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 2a34000d3544 (1) A
/ folded(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
/ rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
|
x c473644ee0e9 (2) B
......@@ -421,6 +425,6 @@
|
x c473644ee0e9 (2) B
folded(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
rewritten(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
While with all option, we should see 15 changesets
......@@ -441,7 +445,9 @@
| | | | | note: this is a note stored in obsmarker in prune
| | | | |
| | | x | 100cc25b765f (9) fold2
| | | |\ \ folded(description, parent, content) from 0da815c333f6, d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |\ \ rewritten(description, content) from 0da815c333f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | | note: folding changesets to test
| | | | | | rewritten(description, parent, content) from d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | | note: folding changesets to test
| | | | | |
| +-------x d0f33db50670 (13) fold1
......@@ -453,6 +459,7 @@
| | x / 0da815c333f6 (5) E
| | /
x | | b868bc49b0a4 (7) fold0
|\ \ \ folded(description, parent, content) from 2a34000d3544, c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
|\ \ \ rewritten(description, content) from 2a34000d3544 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | rewritten(description, parent, content) from c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
| | x | d15d0ffc75f6 (8) fold1
......@@ -457,6 +464,7 @@
| | | |
| | x | d15d0ffc75f6 (8) fold1
| | |\ \ folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | |\ \ rewritten(description, parent, content) from 868d2e0eb19c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | rewritten(description, content) from a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | |
| | | | x d9f908fde1a1 (6) F
| | | |
......
......@@ -49,9 +49,9 @@
| x changeset: 2:0dec01379d3b
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | obsolete: folded using fold as 3:eb5a0daa2192
| | obsolete: rewritten using fold as 3:eb5a0daa2192
| | summary: B0
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
......@@ -53,9 +53,9 @@
| | summary: B0
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| obsolete: folded using fold as 3:eb5a0daa2192
| obsolete: rewritten using fold as 3:eb5a0daa2192
| summary: A0
|
o changeset: 0:ea207398892e
......@@ -72,7 +72,7 @@
target
$ hg obslog --hidden 471f378eab4c --patch --no-origin
x 471f378eab4c (1) A0
folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
......@@ -92,7 +92,7 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
/ folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
/ rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
......@@ -96,7 +96,7 @@
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
......@@ -115,7 +115,7 @@
the target
$ hg obslog --hidden 0dec01379d3b --patch --no-origin
x 0dec01379d3b (2) B0
folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, changesets rebased)
Check that with all option, all changesets are shown
......@@ -123,7 +123,7 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
/ folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
/ rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
......@@ -127,7 +127,7 @@
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
......@@ -147,7 +147,7 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
/ folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
/ rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
......@@ -151,7 +151,7 @@
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0