tests/test-rewind.t
branchmercurial-5.0
changeset 5364 be5aa681c122
parent 5159 e5fe3ca5e6ad
parent 5349 e8660b28bfee
equal deleted inserted replaced
5280:90fbbc29b93a 5364:be5aa681c122
    88   $ hg rewind --hidden --to 'desc("c_B0")'
    88   $ hg rewind --hidden --to 'desc("c_B0")'
    89   rewinded to 1 changesets
    89   rewinded to 1 changesets
    90   $ hg debugobsolete
    90   $ hg debugobsolete
    91   7e594302a05d3769b27be88fc3cdfd39d7498498 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
    91   7e594302a05d3769b27be88fc3cdfd39d7498498 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
    92   7e594302a05d3769b27be88fc3cdfd39d7498498 073989a581cf430a844192364fa37606357cbbc2 4 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
    92   7e594302a05d3769b27be88fc3cdfd39d7498498 073989a581cf430a844192364fa37606357cbbc2 4 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
       
    93   $ hg obslog -r 'desc("c_B0")' --no-origin
       
    94   o  073989a581cf (3) c_B0
       
    95   |
       
    96   x  7e594302a05d (2) c_B0
       
    97        pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
       
    98        meta-changed(meta) as 073989a581cf using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
       
    99   
    93   $ hg obslog -r 'desc("c_B0")'
   100   $ hg obslog -r 'desc("c_B0")'
    94   o  073989a581cf (3) c_B0
   101   o  073989a581cf (3) c_B0
       
   102   |    meta-changed(meta) from 7e594302a05d using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
    95   |
   103   |
    96   x  7e594302a05d (2) c_B0
   104   x  7e594302a05d (2) c_B0
    97        pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   105        pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
    98        meta-changed(meta) as 073989a581cf using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
       
    99   
   106   
   100   $ hg log -G
   107   $ hg log -G
   101   o  changeset:   3:073989a581cf
   108   o  changeset:   3:073989a581cf
   102   |  tag:         tip
   109   |  tag:         tip
   103   |  parent:      1:579f120ba918
   110   |  parent:      1:579f120ba918
   163   $ hg debugobsolete
   170   $ hg debugobsolete
   164   7e594302a05d3769b27be88fc3cdfd39d7498498 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
   171   7e594302a05d3769b27be88fc3cdfd39d7498498 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
   165   7e594302a05d3769b27be88fc3cdfd39d7498498 073989a581cf430a844192364fa37606357cbbc2 4 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   172   7e594302a05d3769b27be88fc3cdfd39d7498498 073989a581cf430a844192364fa37606357cbbc2 4 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   166   073989a581cf430a844192364fa37606357cbbc2 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
   173   073989a581cf430a844192364fa37606357cbbc2 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
   167   7e594302a05d3769b27be88fc3cdfd39d7498498 b13b032065ef57a68d9a4cead38ba0f34f95529b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   174   7e594302a05d3769b27be88fc3cdfd39d7498498 b13b032065ef57a68d9a4cead38ba0f34f95529b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   168   $ hg obslog -r 'desc("c_B0")' --all
   175   $ hg obslog -r 'desc("c_B0")' --all --no-origin
   169   x  073989a581cf (3) c_B0
   176   x  073989a581cf (3) c_B0
   170   |    pruned using prune by test (Thu Jan 01 00:00:01 1970 +0000)
   177   |    pruned using prune by test (Thu Jan 01 00:00:01 1970 +0000)
   171   |
   178   |
   172   | o  b13b032065ef (4) c_B0
   179   | o  b13b032065ef (4) c_B0
   173   |/
   180   |/
   174   x  7e594302a05d (2) c_B0
   181   x  7e594302a05d (2) c_B0
   175        pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   182        pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   176        meta-changed(meta) as 073989a581cf using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
   183        meta-changed(meta) as 073989a581cf using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
   177        meta-changed(meta) as b13b032065ef using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
   184        meta-changed(meta) as b13b032065ef using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
       
   185   
       
   186   $ hg obslog -r 'desc("c_B0")' --all
       
   187   x  073989a581cf (3) c_B0
       
   188   |    meta-changed(meta) from 7e594302a05d using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
       
   189   |    pruned using prune by test (Thu Jan 01 00:00:01 1970 +0000)
       
   190   |
       
   191   | o  b13b032065ef (4) c_B0
       
   192   |/     meta-changed(meta) from 7e594302a05d using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
       
   193   |
       
   194   x  7e594302a05d (2) c_B0
       
   195        pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   178   
   196   
   179   $ hg log -G
   197   $ hg log -G
   180   o  changeset:   4:b13b032065ef
   198   o  changeset:   4:b13b032065ef
   181   |  tag:         tip
   199   |  tag:         tip
   182   |  parent:      1:579f120ba918
   200   |  parent:      1:579f120ba918
   266   2 new content-divergent changesets
   284   2 new content-divergent changesets
   267   rewinded to 1 changesets
   285   rewinded to 1 changesets
   268   $ hg debugobsolete
   286   $ hg debugobsolete
   269   7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
   287   7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
   270   7e594302a05d3769b27be88fc3cdfd39d7498498 b13b032065ef57a68d9a4cead38ba0f34f95529b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   288   7e594302a05d3769b27be88fc3cdfd39d7498498 b13b032065ef57a68d9a4cead38ba0f34f95529b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
       
   289   $ hg obslog --rev 'desc("c_B0")' --no-origin
       
   290   *  b13b032065ef (4) c_B0
       
   291   |
       
   292   x  7e594302a05d (2) c_B0
       
   293        rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
       
   294        meta-changed(meta) as b13b032065ef using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
       
   295   
   271   $ hg obslog --rev 'desc("c_B0")'
   296   $ hg obslog --rev 'desc("c_B0")'
   272   *  b13b032065ef (4) c_B0
   297   *  b13b032065ef (4) c_B0
   273   |
   298   |    meta-changed(meta) from 7e594302a05d using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
   274   x  7e594302a05d (2) c_B0
   299   |
   275        rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
   300   x  7e594302a05d (2) c_B0
   276        meta-changed(meta) as b13b032065ef using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
       
   277   
   301   
   278   $ hg log -G
   302   $ hg log -G
   279   *  changeset:   4:b13b032065ef
   303   *  changeset:   4:b13b032065ef
   280   |  tag:         tip
   304   |  tag:         tip
   281   |  parent:      1:579f120ba918
   305   |  parent:      1:579f120ba918
   370   7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
   394   7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
   371   7e594302a05d3769b27be88fc3cdfd39d7498498 b13b032065ef57a68d9a4cead38ba0f34f95529b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   395   7e594302a05d3769b27be88fc3cdfd39d7498498 b13b032065ef57a68d9a4cead38ba0f34f95529b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   372   b13b032065ef57a68d9a4cead38ba0f34f95529b 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
   396   b13b032065ef57a68d9a4cead38ba0f34f95529b 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
   373   7e594302a05d3769b27be88fc3cdfd39d7498498 837cd997bb05a27f8ed7d1ba3ff1e8422b9b464e 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   397   7e594302a05d3769b27be88fc3cdfd39d7498498 837cd997bb05a27f8ed7d1ba3ff1e8422b9b464e 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   374   25c8f5ab0c3bb569ec672570f1a901be4c6f032b 837cd997bb05a27f8ed7d1ba3ff1e8422b9b464e 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
   398   25c8f5ab0c3bb569ec672570f1a901be4c6f032b 837cd997bb05a27f8ed7d1ba3ff1e8422b9b464e 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
   375   $ hg obslog --rev 'desc("c_B0")'
   399   $ hg obslog --rev 'desc("c_B0")' --no-origin
   376   @    837cd997bb05 (5) c_B0
   400   @    837cd997bb05 (5) c_B0
   377   |\
   401   |\
   378   x |  25c8f5ab0c3b (3) c_B1
   402   x |  25c8f5ab0c3b (3) c_B1
   379   |/     rewritten(description, meta, content) as 837cd997bb05 using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
   403   |/     rewritten(description, meta, content) as 837cd997bb05 using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
   380   |
   404   |
   381   x  7e594302a05d (2) c_B0
   405   x  7e594302a05d (2) c_B0
   382        rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
   406        rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
   383        meta-changed(meta) as 837cd997bb05 using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
   407        meta-changed(meta) as 837cd997bb05 using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
   384        meta-changed(meta) as b13b032065ef using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
   408        meta-changed(meta) as b13b032065ef using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
       
   409   
       
   410   $ hg obslog --rev 'desc("c_B0")'
       
   411   @    837cd997bb05 (5) c_B0
       
   412   |\     rewritten(description, meta, content) from 25c8f5ab0c3b using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
       
   413   | |    meta-changed(meta) from 7e594302a05d using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
       
   414   | |
       
   415   x |  25c8f5ab0c3b (3) c_B1
       
   416   |/     rewritten(description, content) from 7e594302a05d using amend by test (Thu Jan 01 00:00:01 1970 +0000)
       
   417   |
       
   418   x  7e594302a05d (2) c_B0
   385   
   419   
   386   $ hg log -G
   420   $ hg log -G
   387   @  changeset:   5:837cd997bb05
   421   @  changeset:   5:837cd997bb05
   388   |  tag:         tip
   422   |  tag:         tip
   389   |  parent:      1:579f120ba918
   423   |  parent:      1:579f120ba918
   509      date:        Thu Jan 01 00:00:00 1970 +0000
   543      date:        Thu Jan 01 00:00:00 1970 +0000
   510      summary:     c_ROOT
   544      summary:     c_ROOT
   511   
   545   
   512   $ hg debugobsolete
   546   $ hg debugobsolete
   513   49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'operation': 'split', 'user': 'test'}
   547   49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'operation': 'split', 'user': 'test'}
   514   $ hg obslog --all
   548   $ hg obslog --all --no-origin
   515   @  9576e80d6851 (5) c_CD0
   549   @  9576e80d6851 (5) c_CD0
   516   |
   550   |
   517   | o  a0316c4c5417 (4) c_CD0
   551   | o  a0316c4c5417 (4) c_CD0
   518   |/
   552   |/
   519   x  49fb7d900906 (3) c_CD0
   553   x  49fb7d900906 (3) c_CD0
   520        split(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000)
   554        split(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000)
   521   
   555   
       
   556   $ hg obslog --all
       
   557   @  9576e80d6851 (5) c_CD0
       
   558   |    split(parent, content) from 49fb7d900906 using split by test (Thu Jan 01 00:00:02 1970 +0000)
       
   559   |
       
   560   | o  a0316c4c5417 (4) c_CD0
       
   561   |/     split(parent, content) from 49fb7d900906 using split by test (Thu Jan 01 00:00:02 1970 +0000)
       
   562   |
       
   563   x  49fb7d900906 (3) c_CD0
       
   564   
   522 
   565 
   523 Actual rewind
   566 Actual rewind
   524 `````````````
   567 `````````````
   525 
   568 
   526   $ hg rewind --hidden --to 'min(desc("c_CD0"))'
   569   $ hg rewind --hidden --to 'min(desc("c_CD0"))'
   530   $ hg debugobsolete
   573   $ hg debugobsolete
   531   49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'operation': 'split', 'user': 'test'}
   574   49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'operation': 'split', 'user': 'test'}
   532   49fb7d900906b0a3d329e90da4dcb0a7582d3b6e 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   575   49fb7d900906b0a3d329e90da4dcb0a7582d3b6e 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   533   9576e80d6851ce79cd535e2dc5fa01b444d89a39 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '14', 'operation': 'rewind', 'user': 'test'}
   576   9576e80d6851ce79cd535e2dc5fa01b444d89a39 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '14', 'operation': 'rewind', 'user': 'test'}
   534   a0316c4c54179357e71d068fb8884678ebc7c351 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '10', 'operation': 'rewind', 'user': 'test'}
   577   a0316c4c54179357e71d068fb8884678ebc7c351 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '10', 'operation': 'rewind', 'user': 'test'}
   535   $ hg obslog
   578   $ hg obslog --no-origin
   536   @    4535d0af405c (6) c_CD0
   579   @    4535d0af405c (6) c_CD0
   537   |\
   580   |\
   538   | \
   581   | \
   539   | |\
   582   | |\
   540   | x |  9576e80d6851 (5) c_CD0
   583   | x |  9576e80d6851 (5) c_CD0
   544   |/     rewritten(meta, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
   587   |/     rewritten(meta, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
   545   |
   588   |
   546   x  49fb7d900906 (3) c_CD0
   589   x  49fb7d900906 (3) c_CD0
   547        meta-changed(meta) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
   590        meta-changed(meta) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
   548        split(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000)
   591        split(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000)
       
   592   
       
   593   $ hg obslog
       
   594   @    4535d0af405c (6) c_CD0
       
   595   |\     meta-changed(meta) from 49fb7d900906 using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
       
   596   | |    rewritten(meta, parent, content) from 9576e80d6851 using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
       
   597   | |    rewritten(meta, content) from a0316c4c5417 using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
       
   598   | |
       
   599   | \
       
   600   | |\
       
   601   | x |  9576e80d6851 (5) c_CD0
       
   602   |/ /     split(parent, content) from 49fb7d900906 using split by test (Thu Jan 01 00:00:02 1970 +0000)
       
   603   | |
       
   604   | x  a0316c4c5417 (4) c_CD0
       
   605   |/     split(parent, content) from 49fb7d900906 using split by test (Thu Jan 01 00:00:02 1970 +0000)
       
   606   |
       
   607   x  49fb7d900906 (3) c_CD0
   549   
   608   
   550   $ hg log -G
   609   $ hg log -G
   551   @  changeset:   6:4535d0af405c
   610   @  changeset:   6:4535d0af405c
   552   |  tag:         tip
   611   |  tag:         tip
   553   |  parent:      2:7e594302a05d
   612   |  parent:      2:7e594302a05d
   592   9576e80d6851ce79cd535e2dc5fa01b444d89a39 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '14', 'operation': 'rewind', 'user': 'test'}
   651   9576e80d6851ce79cd535e2dc5fa01b444d89a39 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '14', 'operation': 'rewind', 'user': 'test'}
   593   a0316c4c54179357e71d068fb8884678ebc7c351 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '10', 'operation': 'rewind', 'user': 'test'}
   652   a0316c4c54179357e71d068fb8884678ebc7c351 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '10', 'operation': 'rewind', 'user': 'test'}
   594   a0316c4c54179357e71d068fb8884678ebc7c351 e76375de0bfc9c59bdd91067c901f3eed7d6c8fe 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   653   a0316c4c54179357e71d068fb8884678ebc7c351 e76375de0bfc9c59bdd91067c901f3eed7d6c8fe 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   595   9576e80d6851ce79cd535e2dc5fa01b444d89a39 95d72d892df7fec59107e10914c5729bdf03665f 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   654   9576e80d6851ce79cd535e2dc5fa01b444d89a39 95d72d892df7fec59107e10914c5729bdf03665f 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   596   4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b e76375de0bfc9c59bdd91067c901f3eed7d6c8fe 95d72d892df7fec59107e10914c5729bdf03665f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '14', 'operation': 'rewind', 'user': 'test'}
   655   4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b e76375de0bfc9c59bdd91067c901f3eed7d6c8fe 95d72d892df7fec59107e10914c5729bdf03665f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '14', 'operation': 'rewind', 'user': 'test'}
   597   $ hg obslog -r -2:
   656   $ hg obslog -r -2: --no-origin
   598   @    95d72d892df7 (8) c_CD0
   657   @    95d72d892df7 (8) c_CD0
   599   |\
   658   |\
   600   +---o  e76375de0bfc (7) c_CD0
   659   +---o  e76375de0bfc (7) c_CD0
   601   | | |
   660   | | |
   602   x---+  4535d0af405c (6) c_CD0
   661   x---+  4535d0af405c (6) c_CD0
   668   atop:[3] c_A1
   727   atop:[3] c_A1
   669   working directory is now at a65fceb2324a
   728   working directory is now at a65fceb2324a
   670   $ hg debugobsolete
   729   $ hg debugobsolete
   671   579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
   730   579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
   672   7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
   731   7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
       
   732   $ hg obslog -r 'desc("c_A1")::' --no-origin
       
   733   @  a65fceb2324a (4) c_B0
       
   734   |
       
   735   | o  d952d1794ff6 (3) c_A1
       
   736   | |
       
   737   | x  579f120ba918 (1) c_A0
       
   738   |      rewritten(description, content) as d952d1794ff6 using amend by test (Thu Jan 01 00:00:03 1970 +0000)
       
   739   |
       
   740   x  7e594302a05d (2) c_B0
       
   741        rebased(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
       
   742   
   673   $ hg obslog -r 'desc("c_A1")::'
   743   $ hg obslog -r 'desc("c_A1")::'
   674   @  a65fceb2324a (4) c_B0
   744   @  a65fceb2324a (4) c_B0
       
   745   |    rebased(parent) from 7e594302a05d using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
   675   |
   746   |
   676   | o  d952d1794ff6 (3) c_A1
   747   | o  d952d1794ff6 (3) c_A1
       
   748   | |    rewritten(description, content) from 579f120ba918 using amend by test (Thu Jan 01 00:00:03 1970 +0000)
   677   | |
   749   | |
   678   | x  579f120ba918 (1) c_A0
   750   | x  579f120ba918 (1) c_A0
   679   |      rewritten(description, content) as d952d1794ff6 using amend by test (Thu Jan 01 00:00:03 1970 +0000)
   751   |
   680   |
   752   x  7e594302a05d (2) c_B0
   681   x  7e594302a05d (2) c_B0
       
   682        rebased(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
       
   683   
   753   
   684   $ hg log -G
   754   $ hg log -G
   685   @  changeset:   4:a65fceb2324a
   755   @  changeset:   4:a65fceb2324a
   686   |  tag:         tip
   756   |  tag:         tip
   687   |  user:        test
   757   |  user:        test
   711   $ hg debugobsolete
   781   $ hg debugobsolete
   712   579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
   782   579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
   713   7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
   783   7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
   714   7e594302a05d3769b27be88fc3cdfd39d7498498 ac979e0aac4e63ccbbf88ac33942192942302766 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   784   7e594302a05d3769b27be88fc3cdfd39d7498498 ac979e0aac4e63ccbbf88ac33942192942302766 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   715   a65fceb2324ae1eb1231610193d24a5fa02c7c0e ac979e0aac4e63ccbbf88ac33942192942302766 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   785   a65fceb2324ae1eb1231610193d24a5fa02c7c0e ac979e0aac4e63ccbbf88ac33942192942302766 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   716   $ hg obslog
   786   $ hg obslog --no-origin
   717   @    ac979e0aac4e (5) c_B0
   787   @    ac979e0aac4e (5) c_B0
   718   |\
   788   |\
   719   | x  a65fceb2324a (4) c_B0
   789   | x  a65fceb2324a (4) c_B0
   720   |/     rewritten(meta, parent) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
   790   |/     rewritten(meta, parent) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
   721   |
   791   |
   722   x  7e594302a05d (2) c_B0
   792   x  7e594302a05d (2) c_B0
   723        rebased(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
   793        rebased(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
   724        meta-changed(meta) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
   794        meta-changed(meta) as ac979e0aac4e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
       
   795   
       
   796   $ hg obslog
       
   797   @    ac979e0aac4e (5) c_B0
       
   798   |\     meta-changed(meta) from 7e594302a05d using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
       
   799   | |    rewritten(meta, parent) from a65fceb2324a using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
       
   800   | |
       
   801   | x  a65fceb2324a (4) c_B0
       
   802   |/     rebased(parent) from 7e594302a05d using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
       
   803   |
       
   804   x  7e594302a05d (2) c_B0
   725   
   805   
   726   $ hg log -G
   806   $ hg log -G
   727   @  changeset:   5:ac979e0aac4e
   807   @  changeset:   5:ac979e0aac4e
   728   |  tag:         tip
   808   |  tag:         tip
   729   |  parent:      1:579f120ba918
   809   |  parent:      1:579f120ba918
   785   7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
   865   7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
   786   7e594302a05d3769b27be88fc3cdfd39d7498498 ac979e0aac4e63ccbbf88ac33942192942302766 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   866   7e594302a05d3769b27be88fc3cdfd39d7498498 ac979e0aac4e63ccbbf88ac33942192942302766 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   787   a65fceb2324ae1eb1231610193d24a5fa02c7c0e ac979e0aac4e63ccbbf88ac33942192942302766 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   867   a65fceb2324ae1eb1231610193d24a5fa02c7c0e ac979e0aac4e63ccbbf88ac33942192942302766 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   788   a65fceb2324ae1eb1231610193d24a5fa02c7c0e a5dd64adbb2af2e646859b35d0d7128daa73cb2b 4 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   868   a65fceb2324ae1eb1231610193d24a5fa02c7c0e a5dd64adbb2af2e646859b35d0d7128daa73cb2b 4 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   789   ac979e0aac4e63ccbbf88ac33942192942302766 a5dd64adbb2af2e646859b35d0d7128daa73cb2b 0 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   869   ac979e0aac4e63ccbbf88ac33942192942302766 a5dd64adbb2af2e646859b35d0d7128daa73cb2b 0 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   790   $ hg obslog
   870   $ hg obslog --no-origin
   791   @    a5dd64adbb2a (6) c_B0
   871   @    a5dd64adbb2a (6) c_B0
   792   |\
   872   |\
   793   | x  ac979e0aac4e (5) c_B0
   873   | x  ac979e0aac4e (5) c_B0
   794   |/|    rewritten(meta, parent) as a5dd64adbb2a using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
   874   |/|    rewritten(meta, parent) as a5dd64adbb2a using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
   795   | |
   875   | |
   817   ac979e0aac4e63ccbbf88ac33942192942302766 a5dd64adbb2af2e646859b35d0d7128daa73cb2b 0 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   897   ac979e0aac4e63ccbbf88ac33942192942302766 a5dd64adbb2af2e646859b35d0d7128daa73cb2b 0 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   818   579f120ba91885449adc92eedf48ef3569742cee 9c28b7ed3951fd15b20ab75449c1e0fdec445958 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   898   579f120ba91885449adc92eedf48ef3569742cee 9c28b7ed3951fd15b20ab75449c1e0fdec445958 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   819   ac979e0aac4e63ccbbf88ac33942192942302766 3f2d8862657d20af331f0c0531f5228eef4d36c5 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   899   ac979e0aac4e63ccbbf88ac33942192942302766 3f2d8862657d20af331f0c0531f5228eef4d36c5 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   820   a5dd64adbb2af2e646859b35d0d7128daa73cb2b 3f2d8862657d20af331f0c0531f5228eef4d36c5 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   900   a5dd64adbb2af2e646859b35d0d7128daa73cb2b 3f2d8862657d20af331f0c0531f5228eef4d36c5 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   821   d952d1794ff657f5c2a82225d2e6307ed930b32f 9c28b7ed3951fd15b20ab75449c1e0fdec445958 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
   901   d952d1794ff657f5c2a82225d2e6307ed930b32f 9c28b7ed3951fd15b20ab75449c1e0fdec445958 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
   822   $ hg obslog
   902   $ hg obslog --no-origin
   823   @    3f2d8862657d (8) c_B0
   903   @    3f2d8862657d (8) c_B0
   824   |\
   904   |\
   825   x |  a5dd64adbb2a (6) c_B0
   905   x |  a5dd64adbb2a (6) c_B0
   826   |\|    rewritten(meta, parent) as 3f2d8862657d using rewind by test (Thu Jan 01 00:00:05 1970 +0000)
   906   |\|    rewritten(meta, parent) as 3f2d8862657d using rewind by test (Thu Jan 01 00:00:05 1970 +0000)
   827   | |
   907   | |
   877   d952d1794ff657f5c2a82225d2e6307ed930b32f 9c28b7ed3951fd15b20ab75449c1e0fdec445958 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
   957   d952d1794ff657f5c2a82225d2e6307ed930b32f 9c28b7ed3951fd15b20ab75449c1e0fdec445958 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
   878   d952d1794ff657f5c2a82225d2e6307ed930b32f fef4355b4cc9e2d3ddc154f60e4f4f1a286e9ce7 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   958   d952d1794ff657f5c2a82225d2e6307ed930b32f fef4355b4cc9e2d3ddc154f60e4f4f1a286e9ce7 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
   879   a5dd64adbb2af2e646859b35d0d7128daa73cb2b d36d6d267714108384f31762b6193c32f9f97514 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   959   a5dd64adbb2af2e646859b35d0d7128daa73cb2b d36d6d267714108384f31762b6193c32f9f97514 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   880   3f2d8862657d20af331f0c0531f5228eef4d36c5 d36d6d267714108384f31762b6193c32f9f97514 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   960   3f2d8862657d20af331f0c0531f5228eef4d36c5 d36d6d267714108384f31762b6193c32f9f97514 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '6', 'operation': 'rewind', 'user': 'test'}
   881   9c28b7ed3951fd15b20ab75449c1e0fdec445958 fef4355b4cc9e2d3ddc154f60e4f4f1a286e9ce7 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
   961   9c28b7ed3951fd15b20ab75449c1e0fdec445958 fef4355b4cc9e2d3ddc154f60e4f4f1a286e9ce7 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
   882   $ hg obslog
   962   $ hg obslog --no-origin
   883   @    d36d6d267714 (10) c_B0
   963   @    d36d6d267714 (10) c_B0
   884   |\
   964   |\
   885   x |  3f2d8862657d (8) c_B0
   965   x |  3f2d8862657d (8) c_B0
   886   |\|    rewritten(meta, parent) as d36d6d267714 using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
   966   |\|    rewritten(meta, parent) as d36d6d267714 using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
   887   | |
   967   | |
  1000 Clean wdir
  1080 Clean wdir
  1001 
  1081 
  1002   $ hg rewind --keep --to 'desc("initial")' --hidden
  1082   $ hg rewind --keep --to 'desc("initial")' --hidden
  1003   rewinded to 1 changesets
  1083   rewinded to 1 changesets
  1004   (1 changesets obsoleted)
  1084   (1 changesets obsoleted)
  1005   $ hg obslog
  1085   $ hg debugobsolete
       
  1086   30704102d912d9d35a3d51400c4c93ad1e8bc7f3 2ea5be2f87510c7d26d5866dec83b57a7d939c4a 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
       
  1087   30704102d912d9d35a3d51400c4c93ad1e8bc7f3 b4c97fddc16aa57693fa0a730d4b44ceb75bb35c 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
       
  1088   2ea5be2f87510c7d26d5866dec83b57a7d939c4a b4c97fddc16aa57693fa0a730d4b44ceb75bb35c 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '11', 'operation': 'rewind', 'user': 'test'}
       
  1089   $ hg obslog --no-origin
  1006   @    b4c97fddc16a (3) initial
  1090   @    b4c97fddc16a (3) initial
  1007   |\
  1091   |\
  1008   x |  2ea5be2f8751 (2) amended
  1092   x |  2ea5be2f8751 (2) amended
  1009   |/     rewritten(description, meta, content) as b4c97fddc16a using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
  1093   |/     rewritten(description, meta, content) as b4c97fddc16a using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
  1010   |
  1094   |
  1011   x  30704102d912 (1) initial
  1095   x  30704102d912 (1) initial
  1012        rewritten(description, content) as 2ea5be2f8751 using amend by test (Thu Jan 01 00:00:06 1970 +0000)
  1096        rewritten(description, content) as 2ea5be2f8751 using amend by test (Thu Jan 01 00:00:06 1970 +0000)
  1013        meta-changed(meta) as b4c97fddc16a using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
  1097        meta-changed(meta) as b4c97fddc16a using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
       
  1098   
       
  1099   $ hg obslog
       
  1100   @    b4c97fddc16a (3) initial
       
  1101   |\     rewritten(description, meta, content) from 2ea5be2f8751 using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
       
  1102   | |    meta-changed(meta) from 30704102d912 using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
       
  1103   | |
       
  1104   x |  2ea5be2f8751 (2) amended
       
  1105   |/     rewritten(description, content) from 30704102d912 using amend by test (Thu Jan 01 00:00:06 1970 +0000)
       
  1106   |
       
  1107   x  30704102d912 (1) initial
  1014   
  1108   
  1015   $ hg glf --hidden
  1109   $ hg glf --hidden
  1016   @  3: initial (a b)
  1110   @  3: initial (a b)
  1017   |
  1111   |
  1018   | x  2: amended (a c)
  1112   | x  2: amended (a c)