110  

   110 

   111   $ cd ..  

   111 Test None docstring issue of evolve divergent, which caused hg crush

   112 

   113   $ hg init test2

   114   $ cd test2

   115   $ mkcommits _a _b

   116   $ hg up "desc(_a)"

   117   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

   118   $ mkcommit bdivergent1

   119   created new head

   120   $ hg up "desc(_a)"

   121   0 files updated, 0 files merged, 1 files removed, 0 files unresolved

   122   $ mkcommit bdivergent2

   123   created new head

   124   $ hg prune -s "desc(bdivergent1)" "desc(_b)"

   125   1 changesets pruned

   126   $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden

   127   1 changesets pruned

   128   2 new divergent changesets

   129   $ hg log -G

   130   @  3:e708fd28d5cf@default(draft) add bdivergent2 [divergent]

   131   |

   132   | o  2:c2f698071cba@default(draft) add bdivergent1 [divergent]

   133   |/

   134   o  0:135f39f4bd78@default(draft) add _a []

   135   

   136   $ cat >$TESTTMP/test_extension.py  << EOF

   137   > from mercurial import merge

   138   > origupdate = merge.update

   139   > def newupdate(*args, **kwargs):

   140   >   return origupdate(*args, **kwargs)

   141   > merge.update = newupdate

   142   > EOF

   143   $ cat >> $HGRCPATH << EOF

   144   > [extensions]

   145   > testextension=$TESTTMP/test_extension.py

   146   > EOF

   147   $ hg evolve --all

   148   nothing to evolve on current working copy parent

   149   (do you want to use --divergent)

   150   [2]

   151   $ hg evolve --divergent

   152   merge:[3] add bdivergent2

   153   with: [2] add bdivergent1

   154   base: [1] add _b

   155   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   156   working directory is now at aa26817f6fbe

   157 

   158 

   159   $ cd ..