tests/test-evolve-obshistory-phase-divergent.t
changeset 5123 900668a93629
parent 4983 6d40e0166522
child 5125 ce8479d1a6f9
equal deleted inserted replaced
5122:e3ab6017a40a 5123:900668a93629
    67 -----------
    67 -----------
    68 
    68 
    69 Check that debugobshistory on the divergent revision show both destinations
    69 Check that debugobshistory on the divergent revision show both destinations
    70   $ hg obslog --hidden 471f378eab4c --patch
    70   $ hg obslog --hidden 471f378eab4c --patch
    71   @  471f378eab4c (1) A0
    71   @  471f378eab4c (1) A0
    72        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
    72        reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
    73          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
    73          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
    74          --- a/changeset-description
    74          --- a/changeset-description
    75          +++ b/changeset-description
    75          +++ b/changeset-description
    76          @@ -1,1 +1,1 @@
    76          @@ -1,1 +1,1 @@
    77          -A0
    77          -A0
    82 Check that with all option, every changeset is shown
    82 Check that with all option, every changeset is shown
    83   $ hg obslog --hidden --all 471f378eab4c --patch
    83   $ hg obslog --hidden --all 471f378eab4c --patch
    84   *  fdf9bde5129a (2) A1
    84   *  fdf9bde5129a (2) A1
    85   |
    85   |
    86   @  471f378eab4c (1) A0
    86   @  471f378eab4c (1) A0
    87        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
    87        reworded(description) as fdf9bde5129a using amend 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
   108                   "operation": "amend",
   108                   "operation": "amend",
   109                   "succnodes": [
   109                   "succnodes": [
   110                       "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"
   110                       "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"
   111                   ],
   111                   ],
   112                   "user": "test",
   112                   "user": "test",
   113                   "verb": "rewritten"
   113                   "verb": "reworded"
   114               }
   114               }
   115           ],
   115           ],
   116           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
   116           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
   117           "shortdescription": "A0"
   117           "shortdescription": "A0"
   118       }
   118       }
   121 and the diverent one
   121 and the diverent one
   122   $ hg obslog fdf9bde5129a --patch
   122   $ hg obslog fdf9bde5129a --patch
   123   *  fdf9bde5129a (2) A1
   123   *  fdf9bde5129a (2) A1
   124   |
   124   |
   125   @  471f378eab4c (1) A0
   125   @  471f378eab4c (1) A0
   126        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   126        reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   127          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
   127          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
   128          --- a/changeset-description
   128          --- a/changeset-description
   129          +++ b/changeset-description
   129          +++ b/changeset-description
   130          @@ -1,1 +1,1 @@
   130          @@ -1,1 +1,1 @@
   131          -A0
   131          -A0
   136 Check that all option show all of them
   136 Check that all option show all of them
   137   $ hg obslog fdf9bde5129a -a --patch
   137   $ hg obslog fdf9bde5129a -a --patch
   138   *  fdf9bde5129a (2) A1
   138   *  fdf9bde5129a (2) A1
   139   |
   139   |
   140   @  471f378eab4c (1) A0
   140   @  471f378eab4c (1) A0
   141        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   141        reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   142          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
   142          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
   143          --- a/changeset-description
   143          --- a/changeset-description
   144          +++ b/changeset-description
   144          +++ b/changeset-description
   145          @@ -1,1 +1,1 @@
   145          @@ -1,1 +1,1 @@
   146          -A0
   146          -A0
   151 and the diverent one
   151 and the diverent one
   152   $ hg obslog fdf9bde5129a --patch
   152   $ hg obslog fdf9bde5129a --patch
   153   *  fdf9bde5129a (2) A1
   153   *  fdf9bde5129a (2) A1
   154   |
   154   |
   155   @  471f378eab4c (1) A0
   155   @  471f378eab4c (1) A0
   156        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   156        reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   157          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
   157          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
   158          --- a/changeset-description
   158          --- a/changeset-description
   159          +++ b/changeset-description
   159          +++ b/changeset-description
   160          @@ -1,1 +1,1 @@
   160          @@ -1,1 +1,1 @@
   161          -A0
   161          -A0
   165 Check that all option show all of them
   165 Check that all option show all of them
   166   $ hg obslog fdf9bde5129a -a --patch
   166   $ hg obslog fdf9bde5129a -a --patch
   167   *  fdf9bde5129a (2) A1
   167   *  fdf9bde5129a (2) A1
   168   |
   168   |
   169   @  471f378eab4c (1) A0
   169   @  471f378eab4c (1) A0
   170        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   170        reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   171          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
   171          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
   172          --- a/changeset-description
   172          --- a/changeset-description
   173          +++ b/changeset-description
   173          +++ b/changeset-description
   174          @@ -1,1 +1,1 @@
   174          @@ -1,1 +1,1 @@
   175          -A0
   175          -A0
   180 graph
   180 graph
   181   $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch
   181   $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch
   182   *  fdf9bde5129a (2) A1
   182   *  fdf9bde5129a (2) A1
   183   |
   183   |
   184   @  471f378eab4c (1) A0
   184   @  471f378eab4c (1) A0
   185        rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   185        reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   186          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
   186          diff -r 471f378eab4c -r fdf9bde5129a changeset-description
   187          --- a/changeset-description
   187          --- a/changeset-description
   188          +++ b/changeset-description
   188          +++ b/changeset-description
   189          @@ -1,1 +1,1 @@
   189          @@ -1,1 +1,1 @@
   190          -A0
   190          -A0
   211                   "operation": "amend",
   211                   "operation": "amend",
   212                   "succnodes": [
   212                   "succnodes": [
   213                       "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"
   213                       "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"
   214                   ],
   214                   ],
   215                   "user": "test",
   215                   "user": "test",
   216                   "verb": "rewritten"
   216                   "verb": "reworded"
   217               }
   217               }
   218           ],
   218           ],
   219           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
   219           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
   220           "shortdescription": "A0"
   220           "shortdescription": "A0"
   221       }
   221       }