Mercurial > evolve

comparison tests/test-evolve-obshistory-content-divergent.t @ 3930:d00f0c369bc7 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 02:47:44 +0200
parents f3713d41b85b
children 537fd9a86c06 a2fdbece7ce1
comparison
equal deleted inserted replaced
3929:e709e3817d7e 3930:d00f0c369bc7
35 user: test 35 user: test
36 date: Thu Jan 01 00:00:00 1970 +0000 36 date: Thu Jan 01 00:00:00 1970 +0000
37 summary: ROOT 37 summary: ROOT
38 38
39 $ hg update --hidden 'desc(A0)' 39 $ hg update --hidden 'desc(A0)'
40 updating to a hidden changeset 471f378eab4c
41 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
42 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 40 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
43 working directory parent is obsolete! (471f378eab4c) 41 working directory parent is obsolete! (471f378eab4c)
44 (use 'hg evolve' to update to its successor: fdf9bde5129a) 42 (use 'hg evolve' to update to its successor: fdf9bde5129a)
45 $ hg amend -m "A2" 43 $ hg amend -m "A2"
46 2 new content-divergent changesets 44 2 new content-divergent changesets
51 | user: test 49 | user: test
52 | date: Thu Jan 01 00:00:00 1970 +0000 50 | date: Thu Jan 01 00:00:00 1970 +0000
53 | instability: content-divergent 51 | instability: content-divergent
54 | summary: A2 52 | summary: A2
55 | 53 |
56 | * changeset: 2:fdf9bde5129a 54 | o changeset: 2:fdf9bde5129a
57 |/ parent: 0:ea207398892e 55 |/ parent: 0:ea207398892e
58 | user: test 56 | user: test
59 | date: Thu Jan 01 00:00:00 1970 +0000 57 | date: Thu Jan 01 00:00:00 1970 +0000
60 | instability: content-divergent 58 | instability: content-divergent
61 | summary: A1 59 | summary: A1
98 96
99 Check that with all option, every changeset is shown 97 Check that with all option, every changeset is shown
100 $ hg obslog --hidden --all 471f378eab4c --patch 98 $ hg obslog --hidden --all 471f378eab4c --patch
101 @ 65b757b745b9 (3) A2 99 @ 65b757b745b9 (3) A2
102 | 100 |
103 | * fdf9bde5129a (2) A1 101 | o fdf9bde5129a (2) A1
104 |/ 102 |/
105 x 471f378eab4c (1) A0 103 x 471f378eab4c (1) A0
106 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 104 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
107 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 105 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
108 --- a/changeset-description 106 --- a/changeset-description
161 } 159 }
162 ] 160 ]
163 Check that debugobshistory on the first diverged revision show the revision 161 Check that debugobshistory on the first diverged revision show the revision
164 and the diverent one 162 and the diverent one
165 $ hg obslog fdf9bde5129a --patch 163 $ hg obslog fdf9bde5129a --patch
166 * fdf9bde5129a (2) A1 164 o fdf9bde5129a (2) A1
167 | 165 |
168 x 471f378eab4c (1) A0 166 x 471f378eab4c (1) A0
169 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 167 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
170 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 168 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
171 --- a/changeset-description 169 --- a/changeset-description
186 184
187 Check that all option show all of them 185 Check that all option show all of them
188 $ hg obslog fdf9bde5129a -a --patch 186 $ hg obslog fdf9bde5129a -a --patch
189 @ 65b757b745b9 (3) A2 187 @ 65b757b745b9 (3) A2
190 | 188 |
191 | * fdf9bde5129a (2) A1 189 | o fdf9bde5129a (2) A1
192 |/ 190 |/
193 x 471f378eab4c (1) A0 191 x 471f378eab4c (1) A0
194 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 192 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
195 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 193 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
196 --- a/changeset-description 194 --- a/changeset-description
233 231
234 Check that all option show all of them 232 Check that all option show all of them
235 $ hg obslog 65b757b745b9 -a --patch 233 $ hg obslog 65b757b745b9 -a --patch
236 @ 65b757b745b9 (3) A2 234 @ 65b757b745b9 (3) A2
237 | 235 |
238 | * fdf9bde5129a (2) A1 236 | o fdf9bde5129a (2) A1
239 |/ 237 |/
240 x 471f378eab4c (1) A0 238 x 471f378eab4c (1) A0
241 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 239 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
242 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 240 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
243 --- a/changeset-description 241 --- a/changeset-description
258 Check that debugobshistory on the both diverged revision show a coherent 256 Check that debugobshistory on the both diverged revision show a coherent
259 graph 257 graph
260 $ hg obslog '65b757b745b9+fdf9bde5129a' --patch 258 $ hg obslog '65b757b745b9+fdf9bde5129a' --patch
261 @ 65b757b745b9 (3) A2 259 @ 65b757b745b9 (3) A2
262 | 260 |
263 | * fdf9bde5129a (2) A1 261 | o fdf9bde5129a (2) A1
264 |/ 262 |/
265 x 471f378eab4c (1) A0 263 x 471f378eab4c (1) A0
266 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 264 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
267 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 265 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
268 --- a/changeset-description 266 --- a/changeset-description
335 $ hg update 471f378eab4c 333 $ hg update 471f378eab4c
336 abort: hidden revision '471f378eab4c'! 334 abort: hidden revision '471f378eab4c'!
337 (use --hidden to access hidden revisions; diverged) 335 (use --hidden to access hidden revisions; diverged)
338 [255] 336 [255]
339 $ hg update --hidden 'desc(A0)' 337 $ hg update --hidden 'desc(A0)'
340 updating to a hidden changeset 471f378eab4c
341 (hidden revision '471f378eab4c' has diverged)
342 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 338 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
343 working directory parent is obsolete! (471f378eab4c) 339 working directory parent is obsolete! (471f378eab4c)
344 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 340 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)