Mercurial > evolve

comparison tests/test-evolve-obshistory-amend.t @ 4955:e5d92ac69a9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obslog: phase divergence fix for 5c41bb482867 I forgot to pull the latest version before publishing the topic :-(
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 16 Nov 2019 01:45:40 +0100
parents a76ed637acba 5c41bb482867
children bb2042ff6444
comparison
equal deleted inserted replaced
4954:a76ed637acba 4955:e5d92ac69a9c
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
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 ====================
379 @ 92210308515b A3 379 @ 92210308515b A3
380 | 380 |
381 x 4f1685185907 A2 381 x 4f1685185907 A2
382 | description diff: 382 | description diff:
383 | ``` 383 | ```
384 | [diff.diffline|diff -r 4f1685185907 -r 92210308515b changeset-description] 384 | [diff.diffline|diff -r 4f1685185907 -r 92210308515b changeset-description]
385 | [diff.file_a|--- a/changeset-description] 385 | [diff.file_a|--- a/changeset-description]
386 | [diff.file_b|+++ b/changeset-description] 386 | [diff.file_b|+++ b/changeset-description]
387 | [diff.hunk|@@ -1,3 +1,3 @@] 387 | [diff.hunk|@@ -1,3 +1,3 @@]
388 | [diff.deleted|-A2] 388 | [diff.deleted|-A2]
389 | [diff.inserted|+A3] 389 | [diff.inserted|+A3]
390 | 390 |
391 | [diff.deleted|-Better better commit message] 391 | [diff.deleted|-Better better commit message]
392 | [diff.inserted|+Better better better commit message] 392 | [diff.inserted|+Better better better commit message]
393 | ``` 393 | ```
394 x 4ae3a4151de9 A1 394 x 4ae3a4151de9 A1
395 | description diff: 395 | description diff:
396 | ``` 396 | ```
397 | [diff.diffline|diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description] 397 | [diff.diffline|diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description]
398 | [diff.file_a|--- a/changeset-description] 398 | [diff.file_a|--- a/changeset-description]
399 | [diff.file_b|+++ b/changeset-description] 399 | [diff.file_b|+++ b/changeset-description]
400 | [diff.hunk|@@ -1,3 +1,3 @@] 400 | [diff.hunk|@@ -1,3 +1,3 @@]
401 | [diff.deleted|-A1] 401 | [diff.deleted|-A1]
402 | [diff.inserted|+A2] 402 | [diff.inserted|+A2]
403 | 403 |
404 | [diff.deleted|-Better commit message] 404 | [diff.deleted|-Better commit message]
405 | [diff.inserted|+Better better commit message] 405 | [diff.inserted|+Better better commit message]
406 | ``` 406 | ```
407 x 471f378eab4c A0 407 x 471f378eab4c A0
408 description diff: 408 description diff:
409 ``` 409 ```
410 [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description] 410 [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
411 [diff.file_a|--- a/changeset-description] 411 [diff.file_a|--- a/changeset-description]
412 [diff.file_b|+++ b/changeset-description] 412 [diff.file_b|+++ b/changeset-description]
413 [diff.hunk|@@ -1,1 +1,3 @@] 413 [diff.hunk|@@ -1,1 +1,3 @@]
414 [diff.deleted|-A0] 414 [diff.deleted|-A0]
415 [diff.inserted|+A1] 415 [diff.inserted|+A1]
416 [diff.inserted|+] 416 [diff.inserted|+]
417 [diff.inserted|+Better commit message] 417 [diff.inserted|+Better commit message]
418 ``` 418 ```
419 419
420 Check the output on the server 420 Check the output on the server
421 ------------------------------ 421 ------------------------------
422 422
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 rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) 458 rewritten(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 rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 462 rewritten(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 rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) 474 rewritten(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 rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 478 rewritten(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