Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-obshistory-content-divergent.t
branchmercurial-4.3
changeset 3936 537fd9a86c06
parent 3930 d00f0c369bc7
equal deleted inserted replaced
3935:9af0e2b0bdd7 3936:537fd9a86c06 
    26   |  summary:     A1
 
    26   |  summary:     A1
 
    27   |
 
    27   |
 
    28   | x  changeset:   1:471f378eab4c
 
    28   | x  changeset:   1:471f378eab4c
 
    29   |/   user:        test
 
    29   |/   user:        test
 
    30   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
    30   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
    31   |    obsolete:    reworded using amend as 2:fdf9bde5129a
 
    31   |    obsolete:    reworded as fdf9bde5129a
 
    32   |    summary:     A0
 
    32   |    summary:     A0
 
    33   |
 
    33   |
 
    34   o  changeset:   0:ea207398892e
 
    34   o  changeset:   0:ea207398892e
 
    35      user:        test
 
    35      user:        test
 
    36      date:        Thu Jan 01 00:00:00 1970 +0000
 
    36      date:        Thu Jan 01 00:00:00 1970 +0000
 
    39   $ hg update --hidden 'desc(A0)'
 
    39   $ hg update --hidden 'desc(A0)'
 
    40   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    40   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    41   working directory parent is obsolete! (471f378eab4c)
 
    41   working directory parent is obsolete! (471f378eab4c)
 
    42   (use 'hg evolve' to update to its successor: fdf9bde5129a)
 
    42   (use 'hg evolve' to update to its successor: fdf9bde5129a)
 
    43   $ hg amend -m "A2"
 
    43   $ hg amend -m "A2"
 
    44   2 new content-divergent changesets
 
    44   2 new divergent changesets
 
    45   $ hg log --hidden -G
 
    45   $ hg log --hidden -G
 
    46   @  changeset:   3:65b757b745b9
 
    46   @  changeset:   3:65b757b745b9
 
    47   |  tag:         tip
 
    47   |  tag:         tip
 
    48   |  parent:      0:ea207398892e
 
    48   |  parent:      0:ea207398892e
 
    49   |  user:        test
 
    49   |  user:        test
 
    50   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
    50   |  date:        Thu Jan 01 00:00:00 1970 +0000
 
    51   |  instability: content-divergent
 
    51   |  trouble:     divergent
 
    52   |  summary:     A2
 
    52   |  summary:     A2
 
    53   |
 
    53   |
 
    54   | o  changeset:   2:fdf9bde5129a
 
    54   | o  changeset:   2:fdf9bde5129a
 
    55   |/   parent:      0:ea207398892e
 
    55   |/   parent:      0:ea207398892e
 
    56   |    user:        test
 
    56   |    user:        test
 
    57   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
    57   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
    58   |    instability: content-divergent
 
    58   |    trouble:     divergent
 
    59   |    summary:     A1
 
    59   |    summary:     A1
 
    60   |
 
    60   |
 
    61   | x  changeset:   1:471f378eab4c
 
    61   | x  changeset:   1:471f378eab4c
 
    62   |/   user:        test
 
    62   |/   user:        test
 
    63   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
    63   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
    64   |    obsolete:    reworded using amend as 2:fdf9bde5129a
 
    64   |    obsolete:    reworded as fdf9bde5129a
 
    65   |    obsolete:    reworded using amend as 3:65b757b745b9
 
    65   |    obsolete:    reworded as 65b757b745b9
 
    66   |    summary:     A0
 
    66   |    summary:     A0
 
    67   |
 
    67   |
 
    68   o  changeset:   0:ea207398892e
 
    68   o  changeset:   0:ea207398892e
 
    69      user:        test
 
    69      user:        test
 
    70      date:        Thu Jan 01 00:00:00 1970 +0000
 
    70      date:        Thu Jan 01 00:00:00 1970 +0000
 
    74 -----------
 
    74 -----------
 
    75 
    75 
    76 Check that debugobshistory on the divergent revision show both destinations
 
    76 Check that debugobshistory on the divergent revision show both destinations
 
    77   $ hg obslog --hidden 471f378eab4c --patch
 
    77   $ hg obslog --hidden 471f378eab4c --patch
 
    78   x  471f378eab4c (1) A0
 
    78   x  471f378eab4c (1) A0
 
    79        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
    79        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
    80          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
    80          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
    81          --- a/changeset-description
 
    81          --- a/changeset-description
 
    82          +++ b/changeset-description
 
    82          +++ b/changeset-description
 
    83          @@ -1,1 +1,1 @@
 
    83          @@ -1,1 +1,1 @@
 
    84          -A0
 
    84          -A0
 
    85          +A2
 
    85          +A2
 
    86   
    86   
    87        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
    87        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
    88          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
    88          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
    89          --- a/changeset-description
 
    89          --- a/changeset-description
 
    90          +++ b/changeset-description
 
    90          +++ b/changeset-description
 
    91          @@ -1,1 +1,1 @@
 
    91          @@ -1,1 +1,1 @@
 
    92          -A0
 
    92          -A0
 
    99   @  65b757b745b9 (3) A2
 
    99   @  65b757b745b9 (3) A2
 
   100   |
 
   100   |
 
   101   | o  fdf9bde5129a (2) A1
 
   101   | o  fdf9bde5129a (2) A1
 
   102   |/
 
   102   |/
 
   103   x  471f378eab4c (1) A0
 
   103   x  471f378eab4c (1) A0
 
   104        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   104        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   105          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
   105          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
   106          --- a/changeset-description
 
   106          --- a/changeset-description
 
   107          +++ b/changeset-description
 
   107          +++ b/changeset-description
 
   108          @@ -1,1 +1,1 @@
 
   108          @@ -1,1 +1,1 @@
 
   109          -A0
 
   109          -A0
 
   110          +A2
 
   110          +A2
 
   111   
   111   
   112        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   112        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   113          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
   113          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
   114          --- a/changeset-description
 
   114          --- a/changeset-description
 
   115          +++ b/changeset-description
 
   115          +++ b/changeset-description
 
   116          @@ -1,1 +1,1 @@
 
   116          @@ -1,1 +1,1 @@
 
   117          -A0
 
   117          -A0
 
   128                       0 (glob)
 
   128                       0 (glob)
 
   129                   ],
 
   129                   ],
 
   130                   "effect": [
 
   130                   "effect": [
 
   131                       "description"
 
   131                       "description"
 
   132                   ],
 
   132                   ],
 
   133                   "operation": "amend",
 
       
   134                   "succnodes": [
 
   133                   "succnodes": [
 
   135                       "65b757b745b9"
 
   134                       "65b757b745b9"
 
   136                   ],
 
   135                   ],
 
   137                   "user": "test",
 
   136                   "user": "test",
 
   138                   "verb": "rewritten"
 
   137                   "verb": "rewritten"
 
   143                       0 (glob)
 
   142                       0 (glob)
 
   144                   ],
 
   143                   ],
 
   145                   "effect": [
 
   144                   "effect": [
 
   146                       "description"
 
   145                       "description"
 
   147                   ],
 
   146                   ],
 
   148                   "operation": "amend",
 
       
   149                   "succnodes": [
 
   147                   "succnodes": [
 
   150                       "fdf9bde5129a"
 
   148                       "fdf9bde5129a"
 
   151                   ],
 
   149                   ],
 
   152                   "user": "test",
 
   150                   "user": "test",
 
   153                   "verb": "rewritten"
 
   151                   "verb": "rewritten"
 
   162 and the diverent one
 
   160 and the diverent one
 
   163   $ hg obslog fdf9bde5129a --patch
 
   161   $ hg obslog fdf9bde5129a --patch
 
   164   o  fdf9bde5129a (2) A1
 
   162   o  fdf9bde5129a (2) A1
 
   165   |
 
   163   |
 
   166   x  471f378eab4c (1) A0
 
   164   x  471f378eab4c (1) A0
 
   167        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   165        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   168          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
   166          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
   169          --- a/changeset-description
 
   167          --- a/changeset-description
 
   170          +++ b/changeset-description
 
   168          +++ b/changeset-description
 
   171          @@ -1,1 +1,1 @@
 
   169          @@ -1,1 +1,1 @@
 
   172          -A0
 
   170          -A0
 
   173          +A2
 
   171          +A2
 
   174   
   172   
   175        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   173        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   176          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
   174          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
   177          --- a/changeset-description
 
   175          --- a/changeset-description
 
   178          +++ b/changeset-description
 
   176          +++ b/changeset-description
 
   179          @@ -1,1 +1,1 @@
 
   177          @@ -1,1 +1,1 @@
 
   180          -A0
 
   178          -A0
 
   187   @  65b757b745b9 (3) A2
 
   185   @  65b757b745b9 (3) A2
 
   188   |
 
   186   |
 
   189   | o  fdf9bde5129a (2) A1
 
   187   | o  fdf9bde5129a (2) A1
 
   190   |/
 
   188   |/
 
   191   x  471f378eab4c (1) A0
 
   189   x  471f378eab4c (1) A0
 
   192        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   190        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   193          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
   191          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
   194          --- a/changeset-description
 
   192          --- a/changeset-description
 
   195          +++ b/changeset-description
 
   193          +++ b/changeset-description
 
   196          @@ -1,1 +1,1 @@
 
   194          @@ -1,1 +1,1 @@
 
   197          -A0
 
   195          -A0
 
   198          +A2
 
   196          +A2
 
   199   
   197   
   200        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   198        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   201          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
   199          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
   202          --- a/changeset-description
 
   200          --- a/changeset-description
 
   203          +++ b/changeset-description
 
   201          +++ b/changeset-description
 
   204          @@ -1,1 +1,1 @@
 
   202          @@ -1,1 +1,1 @@
 
   205          -A0
 
   203          -A0
 
   210 and the diverent one
 
   208 and the diverent one
 
   211   $ hg obslog 65b757b745b9 --patch
 
   209   $ hg obslog 65b757b745b9 --patch
 
   212   @  65b757b745b9 (3) A2
 
   210   @  65b757b745b9 (3) A2
 
   213   |
 
   211   |
 
   214   x  471f378eab4c (1) A0
 
   212   x  471f378eab4c (1) A0
 
   215        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   213        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   216          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
   214          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
   217          --- a/changeset-description
 
   215          --- a/changeset-description
 
   218          +++ b/changeset-description
 
   216          +++ b/changeset-description
 
   219          @@ -1,1 +1,1 @@
 
   217          @@ -1,1 +1,1 @@
 
   220          -A0
 
   218          -A0
 
   221          +A2
 
   219          +A2
 
   222   
   220   
   223        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   221        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   224          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
   222          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
   225          --- a/changeset-description
 
   223          --- a/changeset-description
 
   226          +++ b/changeset-description
 
   224          +++ b/changeset-description
 
   227          @@ -1,1 +1,1 @@
 
   225          @@ -1,1 +1,1 @@
 
   228          -A0
 
   226          -A0
 
   234   @  65b757b745b9 (3) A2
 
   232   @  65b757b745b9 (3) A2
 
   235   |
 
   233   |
 
   236   | o  fdf9bde5129a (2) A1
 
   234   | o  fdf9bde5129a (2) A1
 
   237   |/
 
   235   |/
 
   238   x  471f378eab4c (1) A0
 
   236   x  471f378eab4c (1) A0
 
   239        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   237        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   240          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
   238          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
   241          --- a/changeset-description
 
   239          --- a/changeset-description
 
   242          +++ b/changeset-description
 
   240          +++ b/changeset-description
 
   243          @@ -1,1 +1,1 @@
 
   241          @@ -1,1 +1,1 @@
 
   244          -A0
 
   242          -A0
 
   245          +A2
 
   243          +A2
 
   246   
   244   
   247        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   245        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   248          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
   246          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
   249          --- a/changeset-description
 
   247          --- a/changeset-description
 
   250          +++ b/changeset-description
 
   248          +++ b/changeset-description
 
   251          @@ -1,1 +1,1 @@
 
   249          @@ -1,1 +1,1 @@
 
   252          -A0
 
   250          -A0
 
   259   @  65b757b745b9 (3) A2
 
   257   @  65b757b745b9 (3) A2
 
   260   |
 
   258   |
 
   261   | o  fdf9bde5129a (2) A1
 
   259   | o  fdf9bde5129a (2) A1
 
   262   |/
 
   260   |/
 
   263   x  471f378eab4c (1) A0
 
   261   x  471f378eab4c (1) A0
 
   264        rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   262        rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
 
   265          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
   263          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
 
   266          --- a/changeset-description
 
   264          --- a/changeset-description
 
   267          +++ b/changeset-description
 
   265          +++ b/changeset-description
 
   268          @@ -1,1 +1,1 @@
 
   266          @@ -1,1 +1,1 @@
 
   269          -A0
 
   267          -A0
 
   270          +A2
 
   268          +A2
 
   271   
   269   
   272        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   270        rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
 
   273          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
   271          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
 
   274          --- a/changeset-description
 
   272          --- a/changeset-description
 
   275          +++ b/changeset-description
 
   273          +++ b/changeset-description
 
   276          @@ -1,1 +1,1 @@
 
   274          @@ -1,1 +1,1 @@
 
   277          -A0
 
   275          -A0
 
   294                       0 (glob)
 
   292                       0 (glob)
 
   295                   ],
 
   293                   ],
 
   296                   "effect": [
 
   294                   "effect": [
 
   297                       "description"
 
   295                       "description"
 
   298                   ],
 
   296                   ],
 
   299                   "operation": "amend",
 
       
   300                   "succnodes": [
 
   297                   "succnodes": [
 
   301                       "65b757b745b9"
 
   298                       "65b757b745b9"
 
   302                   ],
 
   299                   ],
 
   303                   "user": "test",
 
   300                   "user": "test",
 
   304                   "verb": "rewritten"
 
   301                   "verb": "rewritten"
 
   309                       0 (glob)
 
   306                       0 (glob)
 
   310                   ],
 
   307                   ],
 
   311                   "effect": [
 
   308                   "effect": [
 
   312                       "description"
 
   309                       "description"
 
   313                   ],
 
   310                   ],
 
   314                   "operation": "amend",
 
       
   315                   "succnodes": [
 
   311                   "succnodes": [
 
   316                       "fdf9bde5129a"
 
   312                       "fdf9bde5129a"
 
   317                   ],
 
   313                   ],
 
   318                   "user": "test",
 
   314                   "user": "test",
 
   319                   "verb": "rewritten"
 
   315                   "verb": "rewritten"
evolve