tests/test-evolve-obshistory-content-divergent.t
changeset 5339 258c0a99c5b0
parent 5171 7f7f40cc6c9b
child 5349 e8660b28bfee
equal deleted inserted replaced
5338:7e93d9db1d1a 5339:258c0a99c5b0
     1 This test file test the various messages when accessing obsolete
     1 Testing obslog and other commands accessing obsolete revisions.
     2 revisions.
       
     3 
     2 
     4 Global setup
     3 Global setup
     5 ============
     4 ============
     6 
     5 
     7   $ . $TESTDIR/testlib/obshistory_setup.sh
     6   $ . $TESTDIR/testlib/obshistory_setup.sh
    77      summary:     ROOT
    76      summary:     ROOT
    78   
    77   
    79 Actual test
    78 Actual test
    80 -----------
    79 -----------
    81 
    80 
    82 Check that debugobshistory on the divergent revision show both destinations
    81 Check that obslog on the divergent revision shows both destinations
    83   $ hg obslog --hidden 471f378eab4c --patch
    82   $ hg obslog --hidden 471f378eab4c --patch
    84   x  471f378eab4c (1) A0
    83   x  471f378eab4c (1) A0
    85        reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
    84        reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
    86          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
    85          diff -r 471f378eab4c -r 65b757b745b9 changeset-description
    87          --- a/changeset-description
    86          --- a/changeset-description
   173           ],
   172           ],
   174           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
   173           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
   175           "shortdescription": "A0"
   174           "shortdescription": "A0"
   176       }
   175       }
   177   ]
   176   ]
   178 Check that debugobshistory on the first diverged revision show the revision
   177 Check that obslog on the first diverged revision shows the revision and the
   179 and the diverent one
   178 divergent one
   180   $ hg obslog fdf9bde5129a --patch
   179   $ hg obslog fdf9bde5129a --patch
   181   *  fdf9bde5129a (2) A1
   180   *  fdf9bde5129a (2) A1
   182   |
   181   |
   183   x  471f378eab4c (1) A0
   182   x  471f378eab4c (1) A0
   184        reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   183        reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   197          -A0
   196          -A0
   198          +A1
   197          +A1
   199   
   198   
   200   
   199   
   201 
   200 
   202 Check that all option show all of them
   201 Check that all option shows all of them
   203   $ hg obslog fdf9bde5129a -a --patch
   202   $ hg obslog fdf9bde5129a -a --patch
   204   @  65b757b745b9 (3) A2
   203   @  65b757b745b9 (3) A2
   205   |
   204   |
   206   | *  fdf9bde5129a (2) A1
   205   | *  fdf9bde5129a (2) A1
   207   |/
   206   |/
   221          @@ -1,1 +1,1 @@
   220          @@ -1,1 +1,1 @@
   222          -A0
   221          -A0
   223          +A1
   222          +A1
   224   
   223   
   225   
   224   
   226 Check that debugobshistory on the second diverged revision show the revision
   225 Check that obslog on the second diverged revision shows the revision and the
   227 and the diverent one
   226 divergent one
   228   $ hg obslog 65b757b745b9 --patch
   227   $ hg obslog 65b757b745b9 --patch
   229   @  65b757b745b9 (3) A2
   228   @  65b757b745b9 (3) A2
   230   |
   229   |
   231   x  471f378eab4c (1) A0
   230   x  471f378eab4c (1) A0
   232        reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   231        reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   244          @@ -1,1 +1,1 @@
   243          @@ -1,1 +1,1 @@
   245          -A0
   244          -A0
   246          +A1
   245          +A1
   247   
   246   
   248   
   247   
   249 Check that all option show all of them
   248 Check that all option shows all of them
   250   $ hg obslog 65b757b745b9 -a --patch
   249   $ hg obslog 65b757b745b9 -a --patch
   251   @  65b757b745b9 (3) A2
   250   @  65b757b745b9 (3) A2
   252   |
   251   |
   253   | *  fdf9bde5129a (2) A1
   252   | *  fdf9bde5129a (2) A1
   254   |/
   253   |/
   268          @@ -1,1 +1,1 @@
   267          @@ -1,1 +1,1 @@
   269          -A0
   268          -A0
   270          +A1
   269          +A1
   271   
   270   
   272   
   271   
   273 Check that debugobshistory on the both diverged revision show a coherent
   272 Check that obslog on the both diverged revision shows a coherent graph
   274 graph
       
   275   $ hg obslog '65b757b745b9+fdf9bde5129a' --patch
   273   $ hg obslog '65b757b745b9+fdf9bde5129a' --patch
   276   @  65b757b745b9 (3) A2
   274   @  65b757b745b9 (3) A2
   277   |
   275   |
   278   | *  fdf9bde5129a (2) A1
   276   | *  fdf9bde5129a (2) A1
   279   |/
   277   |/