tests/test-amend-patch.t
branchmercurial-4.6
changeset 5368 844b1ad5b34b
parent 5349 e8660b28bfee
equal deleted inserted replaced
5284:0471b9ddd0b2 5368:844b1ad5b34b
    82   @  1:af624b221c0c added a
    82   @  1:af624b221c0c added a
    83       () draft
    83       () draft
    84 
    84 
    85 Obsolsence history is fine
    85 Obsolsence history is fine
    86 
    86 
       
    87   $ hg debugobsolete
       
    88   f7ad4196431346de3c33c52e75374fba45e04313 af624b221c0c0bec5d74e2650180dd3eddcb7c42 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
    87   $ hg obslog -p -r .
    89   $ hg obslog -p -r .
    88   @  af624b221c0c (1) added a
    90   @  af624b221c0c (1) added a
       
    91   |    amended(content) from f7ad41964313 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       
    92   |      diff --git a/a b/a
       
    93   |      --- a/a
       
    94   |      +++ b/a
       
    95   |      @@ -1,1 +1,1 @@
       
    96   |      -foo
       
    97   |      +Gello
       
    98   |
    89   |
    99   |
    90   x  f7ad41964313 (0) added a
   100   x  f7ad41964313 (0) added a
    91        amended(content) as af624b221c0c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       
    92          diff --git a/a b/a
       
    93          --- a/a
       
    94          +++ b/a
       
    95          @@ -1,1 +1,1 @@
       
    96          -foo
       
    97          +Gello
       
    98   
       
    99   
   101   
   100 Diff and status are good too
   102 Diff and status are good too
   101   $ hg diff
   103   $ hg diff
   102   $ hg status
   104   $ hg status
   103   ? editor.sh
   105   ? editor.sh
   255   +Gello
   257   +Gello
   256 
   258 
   257   $ hg status
   259   $ hg status
   258   ? editor.sh
   260   ? editor.sh
   259 
   261 
   260   $ ls
   262   $ ls -A
       
   263   .hg
   261   changedfile
   264   changedfile
   262   editor.sh
   265   editor.sh
   263 
   266 
   264 Handling both deletions and additions
   267 Handling both deletions and additions
   265 -------------------------------------
   268 -------------------------------------