comparison tests/test-evolve-obshistory-amend.t @ 5233:6434f3c4f7aa mercurial-5.2

test-compat: merge stable into mercurial-5.2
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 08 Apr 2020 01:16:51 +0800
parents b056868312d1
children 1752a2e7a226 b1db5e32de53
comparison
equal deleted inserted replaced
5232:9ed5f9c5d8ae 5233:6434f3c4f7aa
92 92
93 $ hg obslog --no-graph --patch 4ae3a4151de9 93 $ hg obslog --no-graph --patch 4ae3a4151de9
94 4ae3a4151de9 (2) A1 94 4ae3a4151de9 (2) A1
95 95
96 471f378eab4c (1) A0 96 471f378eab4c (1) A0
97 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 97 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
98 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description 98 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
99 --- a/changeset-description 99 --- a/changeset-description
100 +++ b/changeset-description 100 +++ b/changeset-description
101 @@ -1,1 +1,3 @@ 101 @@ -1,1 +1,3 @@
102 -A0 102 -A0
103 +A1 103 +A1
104 + 104 +
105 +Better commit message 105 +Better commit message
106 106
107 diff -r 471f378eab4c -r 4ae3a4151de9 A0 107 diff -r 471f378eab4c -r 4ae3a4151de9 A0
108 --- a/A0 Thu Jan 01 00:00:00 1970 +0000 108 --- a/A0 Thu Jan 01 00:00:00 1970 +0000
109 +++ b/A0 Thu Jan 01 00:00:00 1970 +0000 109 +++ b/A0 Thu Jan 01 00:00:00 1970 +0000
110 @@ -1,1 +1,2 @@ 110 @@ -1,1 +1,2 @@
111 A0 111 A0
242 242
243 $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9 243 $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
244 4ae3a4151de9 (1) A1 244 4ae3a4151de9 (1) A1
245 245
246 471f378eab4c 246 471f378eab4c
247 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 247 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
248 (No patch available, context is not local) 248 (No patch available, context is not local)
249 249
250 250
251 $ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9 251 $ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9
252 4ae3a4151de9 (1) A1 252 4ae3a4151de9 (1) A1
253 253
254 471f378eab4c 254 471f378eab4c
255 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 255 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
256 (No patch available, context is not local) 256 (No patch available, context is not local)
257 257
258 258
259 Amend two more times 259 Amend two more times
260 ==================== 260 ====================
453 453
454 $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b 454 $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
455 92210308515b (2) A3 455 92210308515b (2) A3
456 456
457 4f1685185907 457 4f1685185907
458 reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) 458 reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
459 (No patch available, context is not local) 459 (No patch available, context is not local)
460 460
461 4ae3a4151de9 (1) A1 461 4ae3a4151de9 (1) A1
462 reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 462 reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
463 (No patch available, successor is unknown locally) 463 (No patch available, successor is unknown locally)
464 464
465 471f378eab4c 465 471f378eab4c
466 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 466 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
467 (No patch available, context is not local) 467 (No patch available, context is not local)
468 468
469 469
470 $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b 470 $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
471 92210308515b (2) A3 471 92210308515b (2) A3
472 472
473 4f1685185907 473 4f1685185907
474 reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) 474 reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
475 (No patch available, context is not local) 475 (No patch available, context is not local)
476 476
477 4ae3a4151de9 (1) A1 477 4ae3a4151de9 (1) A1
478 reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 478 reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
479 (No patch available, successor is unknown locally) 479 (No patch available, successor is unknown locally)
480 480
481 471f378eab4c 481 471f378eab4c
482 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 482 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
483 (No patch available, context is not local) 483 (No patch available, context is not local)
484 484