Mercurial > evolve

comparison tests/test-evolve-obshistory-phase-divergent.t @ 5292:9351e6c22e74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: replace an X+X revset with something meaningful The change in aab2afc2bd82 seem to have been make too hastily.
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 05 May 2020 16:29:52 +0800
parents 258c0a99c5b0
children e8660b28bfee
comparison
equal deleted inserted replaced
5291:258c0a99c5b0 5292:9351e6c22e74
150 -A0 150 -A0
151 +A1 151 +A1
152 152
153 153
154 Check that obslog on the both draft (divergent) and public (diverged) revisions shows a coherent graph 154 Check that obslog on the both draft (divergent) and public (diverged) revisions shows a coherent graph
155 $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch 155 $ hg obslog 'fdf9bde5129a+471f378eab4c' --patch
156 * fdf9bde5129a (2) A1 156 * fdf9bde5129a (2) A1
157 | 157 |
158 @ 471f378eab4c (1) A0 158 @ 471f378eab4c (1) A0
159 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 159 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
160 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 160 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
161 --- a/changeset-description 161 --- a/changeset-description
162 +++ b/changeset-description 162 +++ b/changeset-description
163 @@ -1,1 +1,1 @@ 163 @@ -1,1 +1,1 @@
164 -A0 164 -A0
165 +A1 165 +A1
166 166
167 167
168 $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --no-graph -Tjson | python -m json.tool 168 $ hg obslog 'fdf9bde5129a+471f378eab4c' --no-graph -Tjson | python -m json.tool
169 [ 169 [
170 { 170 {
171 "markers": [], 171 "markers": [],
172 "node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", 172 "node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e",
173 "shortdescription": "A1" 173 "shortdescription": "A1"