tests/test-evolve-obshistory-amend.t
changeset 4948 069cfc5301fb
parent 4946 bd992b1d4426
child 4951 7bfd3fed5d1f
equal deleted inserted replaced
4947:0ad2000854c4 4948:069cfc5301fb
    90   
    90   
    91   
    91   
    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   471f378eab4c (1) A0
    96   471f378eab4c (1) A0
    96     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)
    97       diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
    98       diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
    98       --- a/changeset-description
    99       --- a/changeset-description
    99       +++ b/changeset-description
   100       +++ b/changeset-description
   108       +++ b/A0	Thu Jan 01 00:00:00 1970 +0000
   109       +++ b/A0	Thu Jan 01 00:00:00 1970 +0000
   109       @@ -1,1 +1,2 @@
   110       @@ -1,1 +1,2 @@
   110        A0
   111        A0
   111       +42
   112       +42
   112       
   113       
       
   114   
   113 
   115 
   114 Test that content diff works with templating
   116 Test that content diff works with templating
   115   $ hg obslog --color=debug --patch 4ae3a4151de9 \
   117   $ hg obslog --color=debug --patch 4ae3a4151de9 \
   116   > -T '{node} {desc|firstline}\n{markers % "patch:\n```{patch}```\n"}'
   118   > -T '{node} {desc|firstline}\n{markers % "patch:\n```{patch}```\n"}'
   117   @  4ae3a4151de9 A1
   119   @  4ae3a4151de9 A1
   238   $ hg obslog -R $TESTTMP/server -f --patch 4ae3a4151de9
   240   $ hg obslog -R $TESTTMP/server -f --patch 4ae3a4151de9
   239   o  4ae3a4151de9 (1) A1
   241   o  4ae3a4151de9 (1) A1
   240   
   242   
   241   $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
   243   $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
   242   4ae3a4151de9 (1) A1
   244   4ae3a4151de9 (1) A1
       
   245   
   243   471f378eab4c
   246   471f378eab4c
   244     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)
   245       (No patch available, context is not local)
   248       (No patch available, context is not local)
       
   249   
   246 
   250 
   247   $ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9
   251   $ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9
   248   4ae3a4151de9 (1) A1
   252   4ae3a4151de9 (1) A1
       
   253   
   249   471f378eab4c
   254   471f378eab4c
   250     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)
   251       (No patch available, context is not local)
   256       (No patch available, context is not local)
       
   257   
   252 
   258 
   253 Amend two more times
   259 Amend two more times
   254 ====================
   260 ====================
   255 
   261 
   256 Amend again
   262 Amend again
   445          +Better better better commit message
   451          +Better better better commit message
   446   
   452   
   447   
   453   
   448   $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
   454   $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
   449   92210308515b (2) A3
   455   92210308515b (2) A3
       
   456   
   450   4f1685185907
   457   4f1685185907
   451     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)
   452       (No patch available, context is not local)
   459       (No patch available, context is not local)
       
   460   
   453   4ae3a4151de9 (1) A1
   461   4ae3a4151de9 (1) A1
   454     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)
   455       (No patch available, successor is unknown locally)
   463       (No patch available, successor is unknown locally)
       
   464   
   456   471f378eab4c
   465   471f378eab4c
   457     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)
   458       (No patch available, context is not local)
   467       (No patch available, context is not local)
       
   468   
   459 
   469 
   460   $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
   470   $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
   461   92210308515b (2) A3
   471   92210308515b (2) A3
       
   472   
   462   4f1685185907
   473   4f1685185907
   463     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)
   464       (No patch available, context is not local)
   475       (No patch available, context is not local)
       
   476   
   465   4ae3a4151de9 (1) A1
   477   4ae3a4151de9 (1) A1
   466     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)
   467       (No patch available, successor is unknown locally)
   479       (No patch available, successor is unknown locally)
       
   480   
   468   471f378eab4c
   481   471f378eab4c
   469     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)
   470       (No patch available, context is not local)
   483       (No patch available, context is not local)
       
   484