diff -r 0eba17d734ca -r 3e27cac81df6 tests/test-evolve-obshistory.t --- a/tests/test-evolve-obshistory.t Mon Jan 13 16:32:25 2020 +0700 +++ b/tests/test-evolve-obshistory.t Thu Jan 16 11:33:53 2020 +0700 @@ -116,6 +116,31 @@ +A1 + + $ hg obslog 7a230b46bf61 --patch --origin + @ 7a230b46bf61 (3) A2 + | reworded(description) from fdf9bde5129a using amend by test (at Thu Jan 01 00:00:00 1970 +0000) + | diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description + | --- a/changeset-description + | +++ b/changeset-description + | @@ -1,1 +1,1 @@ + | -A1 + | +A2 + | + | + x fdf9bde5129a (2) A1 + | reworded(description) from 471f378eab4c using amend by test (at Thu Jan 01 00:00:00 1970 +0000) + | diff -r 471f378eab4c -r fdf9bde5129a changeset-description + | --- a/changeset-description + | +++ b/changeset-description + | @@ -1,1 +1,1 @@ + | -A0 + | +A1 + | + | + x 471f378eab4c (1) A0 + + $ cd $TESTTMP/local-remote-markers-2 $ hg pull pulling from $TESTTMP/local-remote-markers-1 @@ -144,6 +169,18 @@ (No patch available, successor is unknown locally) + $ hg obslog 7a230b46bf61 --patch --origin + o 7a230b46bf61 (2) A2 + | reworded(description) from fdf9bde5129a using amend by test (at Thu Jan 01 00:00:00 1970 +0000) + | (No patch available, predecessor is unknown locally) + | + x fdf9bde5129a + | reworded(description) from 471f378eab4c using amend by test (at Thu Jan 01 00:00:00 1970 +0000) + | (No patch available, context is not local) + | + @ 471f378eab4c (1) A0 + + $ hg obslog 7a230b46bf61 --patch -f o 7a230b46bf61 (2) A2 | @@ -170,10 +207,19 @@ $ hg obslog 7a230b46bf61 --graph \ - > -T '{node|short} {rev} {desc|firstline}\n{markers % "rewritten using {operation}"}\n' + > -T '{node|short} {rev} {desc|firstline}\n{markers % "{verb} using {operation}"}\n' o 7a230b46bf61 2 A2 | x fdf9bde5129a - | rewritten using amend + | reworded using amend @ 471f378eab4c 1 A0 - rewritten using amend + reworded using amend + + $ hg obslog 7a230b46bf61 --graph --origin \ + > -T '{node|short} {rev} {desc|firstline}\n{markers % "{verb} using {operation}"}\n' + o 7a230b46bf61 2 A2 + | reworded using amend + x fdf9bde5129a + | reworded using amend + @ 471f378eab4c 1 A0 +