comparison tests/test-obsolete.t @ 571:31efc36f3aac stable

rebase: warn about troubles created by rebase

The previous order created obsolete marker after checking for new troubles

570:1c45a07dda51

  $ hg rebase -s 7 -d 4
  whole rebase set is extinct and ignored.
  nothing to rebase
  [1]
  $ hg rebase -b 3 -d 4 --traceback
  $ hg log -G -r 'not extinct()'  --template='{rev} - {node|short}\n'
  @  11 - 9468a5f5d8b2
  |
  o  10 - 2033b4e49474
  |

571:31efc36f3aac

  $ hg rebase -s 7 -d 4
  whole rebase set is extinct and ignored.
  nothing to rebase
  [1]
  $ hg rebase -b 3 -d 4 --traceback
  2 new conflicting changesets
  $ hg log -G -r 'not extinct()'  --template='{rev} - {node|short}\n'
  @  11 - 9468a5f5d8b2
  |
  o  10 - 2033b4e49474
  |