tests/test-evolve-obshistory-fold.t
changeset 3897 83e8803e1cf1
parent 3890 840c48296511
child 3909 f7afd3a158e3
child 4918 f16274729530
equal deleted inserted replaced
3896:7b782e419df7 3897:83e8803e1cf1
    11 
    11 
    12 Test setup
    12 Test setup
    13 ----------
    13 ----------
    14 
    14 
    15   $ hg init $TESTTMP/local-fold
    15   $ hg init $TESTTMP/local-fold
       
    16   $ hg init $TESTTMP/server
    16   $ cd $TESTTMP/local-fold
    17   $ cd $TESTTMP/local-fold
    17   $ mkcommit ROOT
    18   $ mkcommit ROOT
    18   $ mkcommit A0
    19   $ mkcommit A0
       
    20   $ sync
    19   $ mkcommit B0
    21   $ mkcommit B0
    20   $ hg log --hidden -G
    22   $ hg log --hidden -G
    21   @  changeset:   2:0dec01379d3b
    23   @  changeset:   2:0dec01379d3b
    22   |  tag:         tip
    24   |  tag:         tip
    23   |  user:        test
    25   |  user:        test
    60   o  changeset:   0:ea207398892e
    62   o  changeset:   0:ea207398892e
    61      user:        test
    63      user:        test
    62      date:        Thu Jan 01 00:00:00 1970 +0000
    64      date:        Thu Jan 01 00:00:00 1970 +0000
    63      summary:     ROOT
    65      summary:     ROOT
    64   
    66   
    65  Actual test
    67 
    66  -----------
    68   $ sync
       
    69 Check output of the client
       
    70 --------------------------
    67 
    71 
    68 Check that debugobshistory on the first folded revision show only
    72 Check that debugobshistory on the first folded revision show only
    69 the revision with the target
    73 the revision with the target
    70   $ hg obslog --hidden 471f378eab4c --patch
    74   $ hg obslog --hidden 471f378eab4c --patch
    71   x  471f378eab4c (1) A0
    75   x  471f378eab4c (1) A0
   238   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   242   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   239   updated to hidden changeset 0dec01379d3b
   243   updated to hidden changeset 0dec01379d3b
   240   (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
   244   (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
   241   working directory parent is obsolete! (0dec01379d3b)
   245   working directory parent is obsolete! (0dec01379d3b)
   242   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   246   (use 'hg evolve' to update to its successor: eb5a0daa2192)
       
   247 
       
   248 Check output of the server
       
   249 --------------------------
       
   250 
       
   251   $ hg obslog -R $TESTTMP/server --patch tip --all
       
   252   o    eb5a0daa2192 (2) C0
       
   253   |\
       
   254   x |  0dec01379d3b
       
   255    /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
       
   256   |        (No patch available, context is not local)
       
   257   |
       
   258   x  471f378eab4c (1) A0
       
   259        rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
       
   260          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
       
   261          --- a/changeset-description
       
   262          +++ b/changeset-description
       
   263          @@ -1,1 +1,1 @@
       
   264          -A0
       
   265          +C0
       
   266   
       
   267          diff -r 471f378eab4c -r eb5a0daa2192 B0
       
   268          --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
       
   269          +++ b/B0	Thu Jan 01 00:00:00 1970 +0000
       
   270          @@ -0,0 +1,1 @@
       
   271          +B0
       
   272   
       
   273   
       
   274   $ hg obslog -R $TESTTMP/server -f --all --patch tip
       
   275   o  eb5a0daa2192 (2) C0
       
   276   |
       
   277   x  471f378eab4c (1) A0
       
   278        rewritten(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
       
   279          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
       
   280          --- a/changeset-description
       
   281          +++ b/changeset-description
       
   282          @@ -1,1 +1,1 @@
       
   283          -A0
       
   284          +C0
       
   285   
       
   286          diff -r 471f378eab4c -r eb5a0daa2192 B0
       
   287          --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
       
   288          +++ b/B0	Thu Jan 01 00:00:00 1970 +0000
       
   289          @@ -0,0 +1,1 @@
       
   290          +B0
       
   291   
       
   292   
       
   293 
       
   294   $ hg obslog -R $TESTTMP/server --all --patch 471f378eab4c --hidden
       
   295   o    eb5a0daa2192 (2) C0
       
   296   |\
       
   297   x |  0dec01379d3b
       
   298    /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
       
   299   |        (No patch available, context is not local)
       
   300   |
       
   301   x  471f378eab4c (1) A0
       
   302        rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
       
   303          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
       
   304          --- a/changeset-description
       
   305          +++ b/changeset-description
       
   306          @@ -1,1 +1,1 @@
       
   307          -A0
       
   308          +C0
       
   309   
       
   310          diff -r 471f378eab4c -r eb5a0daa2192 B0
       
   311          --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
       
   312          +++ b/B0	Thu Jan 01 00:00:00 1970 +0000
       
   313          @@ -0,0 +1,1 @@
       
   314          +B0
       
   315   
       
   316   
       
   317   $ hg obslog -R $TESTTMP/server -f --all --patch 471f378eab4c --hidden
       
   318   o  eb5a0daa2192 (2) C0
       
   319   |
       
   320   x  471f378eab4c (1) A0
       
   321        rewritten(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
       
   322          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
       
   323          --- a/changeset-description
       
   324          +++ b/changeset-description
       
   325          @@ -1,1 +1,1 @@
       
   326          -A0
       
   327          +C0
       
   328   
       
   329          diff -r 471f378eab4c -r eb5a0daa2192 B0
       
   330          --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
       
   331          +++ b/B0	Thu Jan 01 00:00:00 1970 +0000
       
   332          @@ -0,0 +1,1 @@
       
   333          +B0
       
   334   
       
   335