Mercurial Mercurial > hg-stable / 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-rename-merge2.t
changeset 44272 17e12938f8e7
parent 42565 4764e8436b2a
child 44299 b4057d001760
equal deleted inserted replaced
44271:6ca9f45b32b0 44272:17e12938f8e7 
    77   test L:up a   R:nc a b W:       - 1  get local a to b
 
    77   test L:up a   R:nc a b W:       - 1  get local a to b
 
    78   --------------
 
    78   --------------
 
    79     unmatched files in other:
 
    79     unmatched files in other:
 
    80      b
 
    80      b
 
    81     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
    81     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
    82      src: 'a' -> dst: 'b' *
 
    82      on remote side:
 
       
    83       src: 'a' -> dst: 'b' *
 
    83     checking for directory renames
 
    84     checking for directory renames
 
    84   resolving manifests
 
    85   resolving manifests
 
    85    branchmerge: True, force: False, partial: False
 
    86    branchmerge: True, force: False, partial: False
 
    86    ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
 
    87    ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
 
    87    preserving a for resolve of b
 
    88    preserving a for resolve of b
 
   115   test L:nc a b R:up a   W:       - 2  get rem change to a and b
 
   116   test L:nc a b R:up a   W:       - 2  get rem change to a and b
 
   116   --------------
 
   117   --------------
 
   117     unmatched files in local:
 
   118     unmatched files in local:
 
   118      b
 
   119      b
 
   119     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   120     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   120      src: 'a' -> dst: 'b' *
 
   121      on local side:
 
       
   122       src: 'a' -> dst: 'b' *
 
   121     checking for directory renames
 
   123     checking for directory renames
 
   122   resolving manifests
 
   124   resolving manifests
 
   123    branchmerge: True, force: False, partial: False
 
   125    branchmerge: True, force: False, partial: False
 
   124    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71
 
   126    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71
 
   125    preserving b for resolve of b
 
   127    preserving b for resolve of b
 
   154   test L:up a   R:nm a b W:       - 3  get local a change to b, remove a
 
   156   test L:up a   R:nm a b W:       - 3  get local a change to b, remove a
 
   155   --------------
 
   157   --------------
 
   156     unmatched files in other:
 
   158     unmatched files in other:
 
   157      b
 
   159      b
 
   158     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   160     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   159      src: 'a' -> dst: 'b' *
 
   161      on remote side:
 
       
   162       src: 'a' -> dst: 'b' *
 
   160     checking for directory renames
 
   163     checking for directory renames
 
   161   resolving manifests
 
   164   resolving manifests
 
   162    branchmerge: True, force: False, partial: False
 
   165    branchmerge: True, force: False, partial: False
 
   163    ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
 
   166    ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
 
   164    preserving a for resolve of b
 
   167    preserving a for resolve of b
 
   192   test L:nm a b R:up a   W:       - 4  get remote change to b
 
   195   test L:nm a b R:up a   W:       - 4  get remote change to b
 
   193   --------------
 
   196   --------------
 
   194     unmatched files in local:
 
   197     unmatched files in local:
 
   195      b
 
   198      b
 
   196     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   199     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   197      src: 'a' -> dst: 'b' *
 
   200      on local side:
 
       
   201       src: 'a' -> dst: 'b' *
 
   198     checking for directory renames
 
   202     checking for directory renames
 
   199   resolving manifests
 
   203   resolving manifests
 
   200    branchmerge: True, force: False, partial: False
 
   204    branchmerge: True, force: False, partial: False
 
   201    ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
 
   205    ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
 
   202    preserving b for resolve of b
 
   206    preserving b for resolve of b
 
   229   test L:       R:nc a b W:       - 5  get b
 
   233   test L:       R:nc a b W:       - 5  get b
 
   230   --------------
 
   234   --------------
 
   231     unmatched files in other:
 
   235     unmatched files in other:
 
   232      b
 
   236      b
 
   233     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   237     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   234      src: 'a' -> dst: 'b' 
   238      on remote side:
 
       
   239       src: 'a' -> dst: 'b' 
   235     checking for directory renames
 
   240     checking for directory renames
 
   236   resolving manifests
 
   241   resolving manifests
 
   237    branchmerge: True, force: False, partial: False
 
   242    branchmerge: True, force: False, partial: False
 
   238    ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24
 
   243    ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24
 
   239    preserving rev for resolve of rev
 
   244    preserving rev for resolve of rev
 
   261   test L:nc a b R:       W:       - 6  nothing
 
   266   test L:nc a b R:       W:       - 6  nothing
 
   262   --------------
 
   267   --------------
 
   263     unmatched files in local:
 
   268     unmatched files in local:
 
   264      b
 
   269      b
 
   265     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   270     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   266      src: 'a' -> dst: 'b' 
   271      on local side:
 
       
   272       src: 'a' -> dst: 'b' 
   267     checking for directory renames
 
   273     checking for directory renames
 
   268   resolving manifests
 
   274   resolving manifests
 
   269    branchmerge: True, force: False, partial: False
 
   275    branchmerge: True, force: False, partial: False
 
   270    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
 
   276    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
 
   271    preserving rev for resolve of rev
 
   277    preserving rev for resolve of rev
 
   292   test L:       R:nm a b W:       - 7  get b
 
   298   test L:       R:nm a b W:       - 7  get b
 
   293   --------------
 
   299   --------------
 
   294     unmatched files in other:
 
   300     unmatched files in other:
 
   295      b
 
   301      b
 
   296     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   302     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   297      src: 'a' -> dst: 'b' 
   303      on remote side:
 
       
   304       src: 'a' -> dst: 'b' 
   298     checking for directory renames
 
   305     checking for directory renames
 
   299   resolving manifests
 
   306   resolving manifests
 
   300    branchmerge: True, force: False, partial: False
 
   307    branchmerge: True, force: False, partial: False
 
   301    ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a
 
   308    ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a
 
   302    preserving rev for resolve of rev
 
   309    preserving rev for resolve of rev
 
   325   test L:nm a b R:       W:       - 8  nothing
 
   332   test L:nm a b R:       W:       - 8  nothing
 
   326   --------------
 
   333   --------------
 
   327     unmatched files in local:
 
   334     unmatched files in local:
 
   328      b
 
   335      b
 
   329     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   336     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   330      src: 'a' -> dst: 'b' 
   337      on local side:
 
       
   338       src: 'a' -> dst: 'b' 
   331     checking for directory renames
 
   339     checking for directory renames
 
   332   resolving manifests
 
   340   resolving manifests
 
   333    branchmerge: True, force: False, partial: False
 
   341    branchmerge: True, force: False, partial: False
 
   334    ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
 
   342    ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
 
   335    preserving rev for resolve of rev
 
   343    preserving rev for resolve of rev
 
   353   created new head
 
   361   created new head
 
   354   --------------
 
   362   --------------
 
   355   test L:um a b R:um a b W:       - 9  do merge with ancestor in a
 
   363   test L:um a b R:um a b W:       - 9  do merge with ancestor in a
 
   356   --------------
 
   364   --------------
 
   357     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   365     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   358      src: 'a' -> dst: 'b' *
 
   366      on local side:
 
       
   367       src: 'a' -> dst: 'b' *
 
       
   368      on remote side:
 
       
   369       src: 'a' -> dst: 'b' *
 
   359     checking for directory renames
 
   370     checking for directory renames
 
   360   resolving manifests
 
   371   resolving manifests
 
   361    branchmerge: True, force: False, partial: False
 
   372    branchmerge: True, force: False, partial: False
 
   362    ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
 
   373    ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
 
   363    preserving b for resolve of b
 
   374    preserving b for resolve of b
 
   398     unmatched files in local:
 
   409     unmatched files in local:
 
   399      b
 
   410      b
 
   400     unmatched files in other:
 
   411     unmatched files in other:
 
   401      c
 
   412      c
 
   402     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   413     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   403      src: 'a' -> dst: 'b' !
 
   414      on local side:
 
   404      src: 'a' -> dst: 'c' !
 
   415       src: 'a' -> dst: 'b' !
 
       
   416      on remote side:
 
       
   417       src: 'a' -> dst: 'c' !
 
   405     checking for directory renames
 
   418     checking for directory renames
 
   406   resolving manifests
 
   419   resolving manifests
 
   407    branchmerge: True, force: False, partial: False
 
   420    branchmerge: True, force: False, partial: False
 
   408    ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e
 
   421    ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e
 
   409   note: possible conflict - a was renamed multiple times to:
 
   422   note: possible conflict - a was renamed multiple times to:
 
   432   created new head
 
   445   created new head
 
   433   --------------
 
   446   --------------
 
   434   test L:nc a b R:up b   W:       - 12 merge b no ancestor
 
   447   test L:nc a b R:up b   W:       - 12 merge b no ancestor
 
   435   --------------
 
   448   --------------
 
   436     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   449     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   437      src: 'a' -> dst: 'b' 
   450      on local side:
 
       
   451       src: 'a' -> dst: 'b' 
   438     checking for directory renames
 
   452     checking for directory renames
 
   439   resolving manifests
 
   453   resolving manifests
 
   440    branchmerge: True, force: False, partial: False
 
   454    branchmerge: True, force: False, partial: False
 
   441    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
 
   455    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
 
   442    preserving b for resolve of b
 
   456    preserving b for resolve of b
 
   471   created new head
 
   485   created new head
 
   472   --------------
 
   486   --------------
 
   473   test L:up b   R:nm a b W:       - 13 merge b no ancestor
 
   487   test L:up b   R:nm a b W:       - 13 merge b no ancestor
 
   474   --------------
 
   488   --------------
 
   475     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   489     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   476      src: 'a' -> dst: 'b' 
   490      on remote side:
 
       
   491       src: 'a' -> dst: 'b' 
   477     checking for directory renames
 
   492     checking for directory renames
 
   478   resolving manifests
 
   493   resolving manifests
 
   479    branchmerge: True, force: False, partial: False
 
   494    branchmerge: True, force: False, partial: False
 
   480    ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
 
   495    ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
 
   481    preserving b for resolve of b
 
   496    preserving b for resolve of b
 
   511   created new head
 
   526   created new head
 
   512   --------------
 
   527   --------------
 
   513   test L:nc a b R:up a b W:       - 14 merge b no ancestor
 
   528   test L:nc a b R:up a b W:       - 14 merge b no ancestor
 
   514   --------------
 
   529   --------------
 
   515     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   530     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   516      src: 'a' -> dst: 'b' 
   531      on local side:
 
       
   532       src: 'a' -> dst: 'b' 
   517     checking for directory renames
 
   533     checking for directory renames
 
   518   resolving manifests
 
   534   resolving manifests
 
   519    branchmerge: True, force: False, partial: False
 
   535    branchmerge: True, force: False, partial: False
 
   520    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
 
   536    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
 
   521    preserving b for resolve of b
 
   537    preserving b for resolve of b
 
   551   created new head
 
   567   created new head
 
   552   --------------
 
   568   --------------
 
   553   test L:up b   R:nm a b W:       - 15 merge b no ancestor, remove a
 
   569   test L:up b   R:nm a b W:       - 15 merge b no ancestor, remove a
 
   554   --------------
 
   570   --------------
 
   555     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   571     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   556      src: 'a' -> dst: 'b' 
   572      on remote side:
 
       
   573       src: 'a' -> dst: 'b' 
   557     checking for directory renames
 
   574     checking for directory renames
 
   558   resolving manifests
 
   575   resolving manifests
 
   559    branchmerge: True, force: False, partial: False
 
   576    branchmerge: True, force: False, partial: False
 
   560    ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
 
   577    ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
 
   561    preserving b for resolve of b
 
   578    preserving b for resolve of b
 
   591   created new head
 
   608   created new head
 
   592   --------------
 
   609   --------------
 
   593   test L:nc a b R:up a b W:       - 16 get a, merge b no ancestor
 
   610   test L:nc a b R:up a b W:       - 16 get a, merge b no ancestor
 
   594   --------------
 
   611   --------------
 
   595     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   612     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   596      src: 'a' -> dst: 'b' 
   613      on local side:
 
       
   614       src: 'a' -> dst: 'b' 
   597     checking for directory renames
 
   615     checking for directory renames
 
   598   resolving manifests
 
   616   resolving manifests
 
   599    branchmerge: True, force: False, partial: False
 
   617    branchmerge: True, force: False, partial: False
 
   600    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
 
   618    ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
 
   601    preserving b for resolve of b
 
   619    preserving b for resolve of b
 
   631   created new head
 
   649   created new head
 
   632   --------------
 
   650   --------------
 
   633   test L:up a b R:nc a b W:       - 17 keep a, merge b no ancestor
 
   651   test L:up a b R:nc a b W:       - 17 keep a, merge b no ancestor
 
   634   --------------
 
   652   --------------
 
   635     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   653     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   636      src: 'a' -> dst: 'b' 
   654      on remote side:
 
       
   655       src: 'a' -> dst: 'b' 
   637     checking for directory renames
 
   656     checking for directory renames
 
   638   resolving manifests
 
   657   resolving manifests
 
   639    branchmerge: True, force: False, partial: False
 
   658    branchmerge: True, force: False, partial: False
 
   640    ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
 
   659    ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
 
   641    preserving b for resolve of b
 
   660    preserving b for resolve of b
 
   670   created new head
 
   689   created new head
 
   671   --------------
 
   690   --------------
 
   672   test L:nm a b R:up a b W:       - 18 merge b no ancestor
 
   691   test L:nm a b R:up a b W:       - 18 merge b no ancestor
 
   673   --------------
 
   692   --------------
 
   674     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   693     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   675      src: 'a' -> dst: 'b' 
   694      on local side:
 
       
   695       src: 'a' -> dst: 'b' 
   676     checking for directory renames
 
   696     checking for directory renames
 
   677   resolving manifests
 
   697   resolving manifests
 
   678    branchmerge: True, force: False, partial: False
 
   698    branchmerge: True, force: False, partial: False
 
   679    ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
 
   699    ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
 
   680    preserving b for resolve of b
 
   700    preserving b for resolve of b
 
   715   created new head
 
   735   created new head
 
   716   --------------
 
   736   --------------
 
   717   test L:up a b R:nm a b W:       - 19 merge b no ancestor, prompt remove a
 
   737   test L:up a b R:nm a b W:       - 19 merge b no ancestor, prompt remove a
 
   718   --------------
 
   738   --------------
 
   719     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   739     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   720      src: 'a' -> dst: 'b' 
   740      on remote side:
 
       
   741       src: 'a' -> dst: 'b' 
   721     checking for directory renames
 
   742     checking for directory renames
 
   722   resolving manifests
 
   743   resolving manifests
 
   723    branchmerge: True, force: False, partial: False
 
   744    branchmerge: True, force: False, partial: False
 
   724    ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
 
   745    ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
 
   725    preserving a for resolve of a
 
   746    preserving a for resolve of a
 
   763   test L:up a   R:um a b W:       - 20 merge a and b to b, remove a
 
   784   test L:up a   R:um a b W:       - 20 merge a and b to b, remove a
 
   764   --------------
 
   785   --------------
 
   765     unmatched files in other:
 
   786     unmatched files in other:
 
   766      b
 
   787      b
 
   767     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   788     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   768      src: 'a' -> dst: 'b' *
 
   789      on remote side:
 
       
   790       src: 'a' -> dst: 'b' *
 
   769     checking for directory renames
 
   791     checking for directory renames
 
   770   resolving manifests
 
   792   resolving manifests
 
   771    branchmerge: True, force: False, partial: False
 
   793    branchmerge: True, force: False, partial: False
 
   772    ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
 
   794    ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
 
   773    preserving a for resolve of b
 
   795    preserving a for resolve of b
 
   805   test L:um a b R:up a   W:       - 21 merge a and b to b
 
   827   test L:um a b R:up a   W:       - 21 merge a and b to b
 
   806   --------------
 
   828   --------------
 
   807     unmatched files in local:
 
   829     unmatched files in local:
 
   808      b
 
   830      b
 
   809     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   831     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   810      src: 'a' -> dst: 'b' *
 
   832      on local side:
 
       
   833       src: 'a' -> dst: 'b' *
 
   811     checking for directory renames
 
   834     checking for directory renames
 
   812   resolving manifests
 
   835   resolving manifests
 
   813    branchmerge: True, force: False, partial: False
 
   836    branchmerge: True, force: False, partial: False
 
   814    ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
 
   837    ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
 
   815    preserving b for resolve of b
 
   838    preserving b for resolve of b
 
   851     unmatched files in local:
 
   874     unmatched files in local:
 
   852      b
 
   875      b
 
   853     unmatched files in other:
 
   876     unmatched files in other:
 
   854      c
 
   877      c
 
   855     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   878     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   856      src: 'a' -> dst: 'b' *
 
   879      on local side:
 
       
   880       src: 'a' -> dst: 'b' *
 
   857     checking for directory renames
 
   881     checking for directory renames
 
   858   resolving manifests
 
   882   resolving manifests
 
   859    branchmerge: True, force: False, partial: False
 
   883    branchmerge: True, force: False, partial: False
 
   860    ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f
 
   884    ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f
 
   861    preserving b for resolve of b
 
   885    preserving b for resolve of b
 
   934     unmatched files in other:
 
   958     unmatched files in other:
 
   935      3/g
 
   959      3/g
 
   936      4/g
 
   960      4/g
 
   937      7/f
 
   961      7/f
 
   938     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   962     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 
   939      src: '1/f' -> dst: '1/g' *
 
   963      on local side:
 
   940      src: '3/f' -> dst: '3/g' *
 
   964       src: '1/f' -> dst: '1/g' *
 
   941      src: '4/f' -> dst: '4/g' *
 
   965       src: '5/f' -> dst: '5/g' *
 
   942      src: '5/f' -> dst: '5/g' *
 
   966       src: '6/f' -> dst: '6/g' *
 
   943      src: '6/f' -> dst: '6/g' *
 
   967      on remote side:
 
       
   968       src: '1/f' -> dst: '1/g' *
 
       
   969       src: '3/f' -> dst: '3/g' *
 
       
   970       src: '4/f' -> dst: '4/g' *
 
   944     checking for directory renames
 
   971     checking for directory renames
 
   945   $ hg mani
 
   972   $ hg mani
 
   946   0/f
 
   973   0/f
 
   947   1/g
 
   974   1/g
 
   948   2/f
 
   975   2/f
hg-stable