tests/test-evolve-effectflags.t
branchstable
changeset 3115 663dbef40f97
parent 3083 e91ca8b5ecf7
child 3116 9f900937c198
child 3520 1f0c88a9dd1c
equal deleted inserted replaced
3114:9db99aee4b87 3115:663dbef40f97
    38   
    38   
    39   $ hg log --hidden -r "desc(A0)"
    39   $ hg log --hidden -r "desc(A0)"
    40   changeset:   1:471f378eab4c
    40   changeset:   1:471f378eab4c
    41   user:        test
    41   user:        test
    42   date:        Thu Jan 01 00:00:00 1970 +0000
    42   date:        Thu Jan 01 00:00:00 1970 +0000
    43   obsolete:    reworded as 2:fdf9bde5129a
    43   obsolete:    reworded using amend as 2:fdf9bde5129a
    44   summary:     A0
    44   summary:     A0
    45   
    45   
    46 
    46 
    47 amend touching the user only
    47 amend touching the user only
    48 ----------------------------
    48 ----------------------------
    62   
    62   
    63   $ hg log --hidden -r "ef4a313b1e0a"
    63   $ hg log --hidden -r "ef4a313b1e0a"
    64   changeset:   3:ef4a313b1e0a
    64   changeset:   3:ef4a313b1e0a
    65   user:        test
    65   user:        test
    66   date:        Thu Jan 01 00:00:00 1970 +0000
    66   date:        Thu Jan 01 00:00:00 1970 +0000
    67   obsolete:    reauthored as 4:5485c92d3433
    67   obsolete:    reauthored using amend as 4:5485c92d3433
    68   summary:     B0
    68   summary:     B0
    69   
    69   
    70 
    70 
    71 amend touching the date only
    71 amend touching the date only
    72 ----------------------------
    72 ----------------------------
    86   
    86   
    87   $ hg log --hidden -r "2ef0680ff450"
    87   $ hg log --hidden -r "2ef0680ff450"
    88   changeset:   5:2ef0680ff450
    88   changeset:   5:2ef0680ff450
    89   user:        test
    89   user:        test
    90   date:        Thu Jan 01 00:00:00 1970 +0000
    90   date:        Thu Jan 01 00:00:00 1970 +0000
    91   obsolete:    date-changed as 6:4dd84345082e
    91   obsolete:    date-changed using amend as 6:4dd84345082e
    92   summary:     B1
    92   summary:     B1
    93   
    93   
    94 
    94 
    95 amend touching the branch only
    95 amend touching the branch only
    96 ----------------------------
    96 ----------------------------
   113   
   113   
   114   $ hg log --hidden -r "bd3db8264cee"
   114   $ hg log --hidden -r "bd3db8264cee"
   115   changeset:   7:bd3db8264cee
   115   changeset:   7:bd3db8264cee
   116   user:        test
   116   user:        test
   117   date:        Thu Jan 01 00:00:00 1970 +0000
   117   date:        Thu Jan 01 00:00:00 1970 +0000
   118   obsolete:    branch-changed as 8:14a01456e057
   118   obsolete:    branch-changed using amend as 8:14a01456e057
   119   summary:     B2
   119   summary:     B2
   120   
   120   
   121 
   121 
   122   $ hg up default
   122   $ hg up default
   123   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   123   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   142   
   142   
   143   $ hg log --hidden -r "c85eff83a034"
   143   $ hg log --hidden -r "c85eff83a034"
   144   changeset:   10:c85eff83a034
   144   changeset:   10:c85eff83a034
   145   user:        test
   145   user:        test
   146   date:        Thu Jan 01 00:00:00 1970 +0000
   146   date:        Thu Jan 01 00:00:00 1970 +0000
   147   obsolete:    rebased as 11:da86aa2f19a3
   147   obsolete:    rebased using rebase as 11:da86aa2f19a3
   148   summary:     D0
   148   summary:     D0
   149   
   149   
   150 
   150 
   151 amend touching the diff
   151 amend touching the diff
   152 -----------------------
   152 -----------------------
   167   
   167   
   168   $ hg log --hidden -r "ebfe0333e0d9"
   168   $ hg log --hidden -r "ebfe0333e0d9"
   169   changeset:   12:ebfe0333e0d9
   169   changeset:   12:ebfe0333e0d9
   170   user:        test
   170   user:        test
   171   date:        Thu Jan 01 00:00:00 1970 +0000
   171   date:        Thu Jan 01 00:00:00 1970 +0000
   172   obsolete:    amended as 13:75781fdbdbf5
   172   obsolete:    amended using amend as 13:75781fdbdbf5
   173   summary:     E0
   173   summary:     E0
   174   
   174   
   175 
   175 
   176 amend with multiple effect (desc and meta)
   176 amend with multiple effect (desc and meta)
   177 -------------------------------------------
   177 -------------------------------------------
   193   
   193   
   194   $ hg log --hidden -r "fad47e5bd78e"
   194   $ hg log --hidden -r "fad47e5bd78e"
   195   changeset:   14:fad47e5bd78e
   195   changeset:   14:fad47e5bd78e
   196   user:        test
   196   user:        test
   197   date:        Thu Jan 01 00:00:00 1970 +0000
   197   date:        Thu Jan 01 00:00:00 1970 +0000
   198   obsolete:    rewritten as 15:a94e0fd5f1c8
   198   obsolete:    rewritten using amend as 15:a94e0fd5f1c8
   199   summary:     F0
   199   summary:     F0
   200   
   200   
   201 
   201 
   202 rebase not touching the diff
   202 rebase not touching the diff
   203 ----------------------------
   203 ----------------------------
   249   $ hg log --hidden -r "b57fed8d8322"
   249   $ hg log --hidden -r "b57fed8d8322"
   250   changeset:   17:b57fed8d8322
   250   changeset:   17:b57fed8d8322
   251   branch:      my-other-branch
   251   branch:      my-other-branch
   252   user:        test
   252   user:        test
   253   date:        Thu Jan 01 00:00:00 1970 +0000
   253   date:        Thu Jan 01 00:00:00 1970 +0000
   254   obsolete:    rebased as 19:e509e2eb3df5
   254   obsolete:    rebased using rebase as 19:e509e2eb3df5
   255   summary:     H1
   255   summary:     H1
   256   
   256   
   257 amend closing the branch should be detected as meta change
   257 amend closing the branch should be detected as meta change
   258 ----------------------------------------------------------
   258 ----------------------------------------------------------
   259 
   259 
   274   $ hg log --hidden -r "2f599e54c1c6"
   274   $ hg log --hidden -r "2f599e54c1c6"
   275   changeset:   21:2f599e54c1c6
   275   changeset:   21:2f599e54c1c6
   276   branch:      closedbranch
   276   branch:      closedbranch
   277   user:        test
   277   user:        test
   278   date:        Thu Jan 01 00:00:00 1970 +0000
   278   date:        Thu Jan 01 00:00:00 1970 +0000
   279   obsolete:    meta-changed as 22:12c6238b5e37
   279   obsolete:    meta-changed using amend as 22:12c6238b5e37
   280   summary:     I0
   280   summary:     I0
   281   
   281