tests/test-fold.t
branchstable
changeset 4831 0852dcba82f6
parent 4723 41885988921e
child 4832 8a491546e81d
equal deleted inserted replaced
4830:4c5377ab147a 4831:0852dcba82f6
   379   | o  3: r3
   379   | o  3: r3
   380   |/
   380   |/
   381   o  0: r0
   381   o  0: r0
   382   
   382   
   383   $ cd ..
   383   $ cd ..
       
   384 
       
   385 Fold should respect experimental.evolution.allowdivergence option
       
   386 https://bz.mercurial-scm.org/show_bug.cgi?id=5817
       
   387 
       
   388   $ hg init issue5817
       
   389   $ cd issue5817
       
   390 
       
   391   $ echo A > foo
       
   392   $ hg ci -qAm A
       
   393   $ echo B > foo
       
   394   $ hg ci -m B
       
   395   $ echo C > foo
       
   396   $ hg ci -m C
       
   397 
       
   398   $ hg fold --exact -r 'desc("A")::desc("B")' -m 'first fold'
       
   399   1 new orphan changesets
       
   400   2 changesets folded
       
   401 
       
   402 FIXME: fold should abort here because divergence is not allowed
       
   403 
       
   404   $ hg fold --exact -r 'desc("A")::desc("B")' -m 'second fold' \
       
   405   >         --config experimental.evolution.allowdivergence=no
       
   406   2 new content-divergent changesets
       
   407   2 changesets folded
       
   408 
       
   409 but if we allow divergence, this should work and should create new content-divergent changesets
       
   410 
       
   411   $ hg fold --exact -r 'desc("A")::desc("B")' -m 'second fold' \
       
   412   >         --config experimental.evolution.allowdivergence=yes
       
   413   2 changesets folded
       
   414 
       
   415   $ cd ..