comparison tests/test-evolve-obshistory-amend.t @ 5635:a34b5cf906c6 mercurial-5.2

test-compat: merge mercurial-5.3 into mercurial-5.2 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 31 Oct 2020 19:05:48 +0800
parents b1db5e32de53 87966baf6ea9
children 8d93e7fc0daa f804b78e9ee5
comparison
equal deleted inserted replaced
5634:afcd4e44816f 5635:a34b5cf906c6
94 x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] 94 x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
95 95
96 96
97 $ hg obslog --no-graph --patch 4ae3a4151de9 97 $ hg obslog --no-graph --patch 4ae3a4151de9
98 4ae3a4151de9 (2) A1 98 4ae3a4151de9 (2) A1
99 rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000) 99 rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
100 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description 100 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
101 --- a/changeset-description 101 --- a/changeset-description
102 +++ b/changeset-description 102 +++ b/changeset-description
103 @@ -1,1 +1,3 @@ 103 @@ -1,1 +1,3 @@
104 -A0 104 -A0
105 +A1 105 +A1
106 + 106 +
107 +Better commit message 107 +Better commit message
108 108
109 diff -r 471f378eab4c -r 4ae3a4151de9 A0 109 diff -r 471f378eab4c -r 4ae3a4151de9 A0
110 --- a/A0 Thu Jan 01 00:00:00 1970 +0000 110 --- a/A0 Thu Jan 01 00:00:00 1970 +0000
111 +++ b/A0 Thu Jan 01 00:00:00 1970 +0000 111 +++ b/A0 Thu Jan 01 00:00:00 1970 +0000
112 @@ -1,1 +1,2 @@ 112 @@ -1,1 +1,2 @@
113 A0 113 A0
232 232
233 $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9 --no-origin 233 $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9 --no-origin
234 4ae3a4151de9 (1) A1 234 4ae3a4151de9 (1) A1
235 235
236 471f378eab4c 236 471f378eab4c
237 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 237 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
238 (No patch available, context is not local) 238 (No patch available, context is not local)
239 239
240 $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9 240 $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
241 4ae3a4151de9 (1) A1 241 4ae3a4151de9 (1) A1
242 rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000) 242 rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
243 (No patch available, predecessor is unknown locally) 243 (No patch available, predecessor is unknown locally)
244 244
245 471f378eab4c 245 471f378eab4c
246 246
247 247
453 | 453 |
454 x 4ae3a4151de9 (1) A1 454 x 4ae3a4151de9 (1) A1
455 455
456 $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b 456 $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
457 92210308515b (2) A3 457 92210308515b (2) A3
458 reworded(description) from 4f1685185907 using amend by test (Thu Jan 01 00:00:01 1970 +0000) 458 reworded(description) from 4f1685185907 using amend by test (Thu Jan 01 00:00:01 1970 +0000)
459 (No patch available, predecessor is unknown locally) 459 (No patch available, predecessor is unknown locally)
460 460
461 4f1685185907 461 4f1685185907
462 reworded(description) from 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 462 reworded(description) from 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
463 (No patch available, context is not local) 463 (No patch available, context is not local)
464 464
465 4ae3a4151de9 (1) A1 465 4ae3a4151de9 (1) A1
466 rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000) 466 rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
467 (No patch available, predecessor is unknown locally) 467 (No patch available, predecessor is unknown locally)
468 468
469 471f378eab4c 469 471f378eab4c
470 470
471 $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b 471 $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
472 92210308515b (2) A3 472 92210308515b (2) A3
473 reworded(description) from 4ae3a4151de9 using amend by test (between Thu Jan 01 00:00:00 1970 +0000 and Thu Jan 01 00:00:01 1970 +0000) 473 reworded(description) from 4ae3a4151de9 using amend by test (between Thu Jan 01 00:00:00 1970 +0000 and Thu Jan 01 00:00:01 1970 +0000)
474 diff -r 4ae3a4151de9 -r 92210308515b changeset-description 474 diff -r 4ae3a4151de9 -r 92210308515b changeset-description
475 --- a/changeset-description 475 --- a/changeset-description
476 +++ b/changeset-description 476 +++ b/changeset-description
477 @@ -1,3 +1,3 @@ 477 @@ -1,3 +1,3 @@
478 -A1 478 -A1
479 +A3 479 +A3
480 480
481 -Better commit message 481 -Better commit message
482 +Better better better commit message 482 +Better better better commit message
483 483
484 484
485 4ae3a4151de9 (1) A1 485 4ae3a4151de9 (1) A1
486 486