tests/test-evolve-orphan-split.t
changeset 3543 93deeed63908
parent 3542 7bd516e0a929
child 3590 d5adce52cef4
child 4291 8f54ab5dd4e2
equal deleted inserted replaced
3542:7bd516e0a929 3543:93deeed63908
   218   0: [f2632392aefe] added a b c
   218   0: [f2632392aefe] added a b c
   219   1: [7f87764e5b64] added a b c
   219   1: [7f87764e5b64] added a b c
   220   q: quit the prompt
   220   q: quit the prompt
   221   enter the index of the revision you want to select: foo
   221   enter the index of the revision you want to select: foo
   222   invalid value 'foo' entered for index
   222   invalid value 'foo' entered for index
   223   could solve instability, ambiguous destination: parent split across two branches
   223   could not solve instability, ambiguous destination: parent split across two branches
   224 
   224 
   225   $ hg evolve --all <<EOF
   225   $ hg evolve --all <<EOF
   226   > 4
   226   > 4
   227   > EOF
   227   > EOF
   228   ancestor 'd48a30875f01' split over multiple topological branches.
   228   ancestor 'd48a30875f01' split over multiple topological branches.
   230   0: [f2632392aefe] added a b c
   230   0: [f2632392aefe] added a b c
   231   1: [7f87764e5b64] added a b c
   231   1: [7f87764e5b64] added a b c
   232   q: quit the prompt
   232   q: quit the prompt
   233   enter the index of the revision you want to select: 4
   233   enter the index of the revision you want to select: 4
   234   invalid value '4' entered for index
   234   invalid value '4' entered for index
   235   could solve instability, ambiguous destination: parent split across two branches
   235   could not solve instability, ambiguous destination: parent split across two branches
   236 
   236 
   237   $ hg evolve --all <<EOF
   237   $ hg evolve --all <<EOF
   238   > -1
   238   > -1
   239   > EOF
   239   > EOF
   240   ancestor 'd48a30875f01' split over multiple topological branches.
   240   ancestor 'd48a30875f01' split over multiple topological branches.
   242   0: [f2632392aefe] added a b c
   242   0: [f2632392aefe] added a b c
   243   1: [7f87764e5b64] added a b c
   243   1: [7f87764e5b64] added a b c
   244   q: quit the prompt
   244   q: quit the prompt
   245   enter the index of the revision you want to select: -1
   245   enter the index of the revision you want to select: -1
   246   invalid value '-1' entered for index
   246   invalid value '-1' entered for index
   247   could solve instability, ambiguous destination: parent split across two branches
   247   could not solve instability, ambiguous destination: parent split across two branches
   248 
   248 
   249   $ hg evolve --all <<EOF
   249   $ hg evolve --all <<EOF
   250   > q
   250   > q
   251   > EOF
   251   > EOF
   252   ancestor 'd48a30875f01' split over multiple topological branches.
   252   ancestor 'd48a30875f01' split over multiple topological branches.
   253   choose an evolve destination:
   253   choose an evolve destination:
   254   0: [f2632392aefe] added a b c
   254   0: [f2632392aefe] added a b c
   255   1: [7f87764e5b64] added a b c
   255   1: [7f87764e5b64] added a b c
   256   q: quit the prompt
   256   q: quit the prompt
   257   enter the index of the revision you want to select: q
   257   enter the index of the revision you want to select: q
   258   could solve instability, ambiguous destination: parent split across two branches
   258   could not solve instability, ambiguous destination: parent split across two branches
   259 
   259 
   260 Doing the evolve with the interactive prompt
   260 Doing the evolve with the interactive prompt
   261 
   261 
   262   $ hg evolve --all <<EOF
   262   $ hg evolve --all <<EOF
   263   > 1
   263   > 1