tests/test-evolve-issue5832.t
changeset 3657 b36e38e3a176
parent 3656 62e4149435d8
child 3714 19ec729f3ca2
child 3898 93d9cde93b82
equal deleted inserted replaced
3656:62e4149435d8 3657:b36e38e3a176
   139    / /    () draft
   139    / /    () draft
   140   o /  5:7014ec2829cd added a
   140   o /  5:7014ec2829cd added a
   141   |/    () draft
   141   |/    () draft
   142   o  0:bde1d2b6b5e5 added base
   142   o  0:bde1d2b6b5e5 added base
   143       () draft
   143       () draft
       
   144 
       
   145   $ cd ..
       
   146 
       
   147 Test for issue5833 present at https://bz.mercurial-scm.org/show_bug.cgi?id=5833
       
   148 ===============================================================================
       
   149 
       
   150   $ hg init issue5833
       
   151   $ cd issue5833
       
   152   $ echo base > base
       
   153   $ hg ci -Aqm "added base"
       
   154 
       
   155   $ echo a > a
       
   156   $ hg ci -Aqm "added a"
       
   157 
       
   158   $ echo b > b
       
   159   $ hg ci -Aqm "added b"
       
   160 
       
   161   $ hg up .^^
       
   162   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
       
   163   $ echo c > c
       
   164   $ echo d > d
       
   165   $ hg ci -Aqm "added c and d"
       
   166 
       
   167   $ hg merge
       
   168   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   169   (branch merge, don't forget to commit)
       
   170   $ hg ci -m "merge commit"
       
   171 
       
   172   $ hg glog
       
   173   @    4:b9b387427a53 merge commit
       
   174   |\    () draft
       
   175   | o  3:9402371b436e added c and d
       
   176   | |   () draft
       
   177   o |  2:a1da0651488c added b
       
   178   | |   () draft
       
   179   o |  1:1b24879c5c3c added a
       
   180   |/    () draft
       
   181   o  0:bde1d2b6b5e5 added base
       
   182       () draft
       
   183  
       
   184   $ hg up bde1d2b6b5e5
       
   185   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
       
   186   $ echo l > l
       
   187   $ hg ci -Aqm "added l"
       
   188   $ hg grab -r 1b24879c5c3c
       
   189   grabbing 1:1b24879c5c3c "added a"
       
   190   2 new orphan changesets
       
   191 
       
   192   $ hg up bde1d2b6b5e5
       
   193   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
       
   194   $ echo c > c
       
   195   $ hg ci -Aqm "added c"
       
   196   $ hg up .^
       
   197   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
   198   $ echo d > d
       
   199   $ hg ci -Aqm "added d"
       
   200 
       
   201   $ hg glog
       
   202   @  8:5841d7cf9893 added d
       
   203   |   () draft
       
   204   | o  7:62fb70414f99 added c
       
   205   |/    () draft
       
   206   | o  6:5568b87b1491 added a
       
   207   | |   () draft
       
   208   | o  5:0a6281e212fe added l
       
   209   |/    () draft
       
   210   | *    4:b9b387427a53 merge commit
       
   211   | |\    () draft
       
   212   +---o  3:9402371b436e added c and d
       
   213   | |     () draft
       
   214   | *  2:a1da0651488c added b
       
   215   | |   () draft
       
   216   | x  1:1b24879c5c3c added a
       
   217   |/    () draft
       
   218   o  0:bde1d2b6b5e5 added base
       
   219       () draft
       
   220 
       
   221   $ hg prune -r 9402371b436e --succ 5841d7cf9893 --succ 62fb70414f99 --split
       
   222   1 changesets pruned
       
   223 
       
   224   $ hg glog
       
   225   @  8:5841d7cf9893 added d
       
   226   |   () draft
       
   227   | o  7:62fb70414f99 added c
       
   228   |/    () draft
       
   229   | o  6:5568b87b1491 added a
       
   230   | |   () draft
       
   231   | o  5:0a6281e212fe added l
       
   232   |/    () draft
       
   233   | *    4:b9b387427a53 merge commit
       
   234   | |\    () draft
       
   235   +---x  3:9402371b436e added c and d
       
   236   | |     () draft
       
   237   | *  2:a1da0651488c added b
       
   238   | |   () draft
       
   239   | x  1:1b24879c5c3c added a
       
   240   |/    () draft
       
   241   o  0:bde1d2b6b5e5 added base
       
   242       () draft
       
   243 
       
   244   $ hg evolve --any --all --dry-run
       
   245   move:[2] added b
       
   246   atop:[6] added a
       
   247   hg rebase -r a1da0651488c -d 5568b87b1491
       
   248   could not solve instability, ambiguous destination: parent split across two branches
       
   249 
       
   250   $ hg evolve --any --all --config ui.interactive=True <<EOF
       
   251   > 1
       
   252   > EOF
       
   253   move:[2] added b
       
   254   atop:[6] added a
       
   255   move:[4] merge commit
       
   256   atop:[9] added b
       
   257   ancestor 'cdf2ea1b9312' split over multiple topological branches.
       
   258   choose an evolve destination:
       
   259   0: [62fb70414f99] added c
       
   260   1: [5841d7cf9893] added d
       
   261   q: quit the prompt
       
   262   enter the index of the revision you want to select: 1
       
   263   move:[10] merge commit
       
   264   atop:[8] added d
       
   265   working directory is now at 460e6e72b7f9
       
   266 
       
   267   $ hg glog
       
   268   @    11:460e6e72b7f9 merge commit
       
   269   |\    () draft
       
   270   | o  9:da76bb7cd904 added b
       
   271   | |   () draft
       
   272   o |  8:5841d7cf9893 added d
       
   273   | |   () draft
       
   274   +---o  7:62fb70414f99 added c
       
   275   | |     () draft
       
   276   | o  6:5568b87b1491 added a
       
   277   | |   () draft
       
   278   | o  5:0a6281e212fe added l
       
   279   |/    () draft
       
   280   o  0:bde1d2b6b5e5 added base
       
   281       () draft