comparison tests/test-prune.t @ 4702:fcecbb1261f2 stable

evolve: fix the inconsistent behaviour of prune (issue6137)

Let's not update to any revision when working directory parent
is not related to the revision being pruned.

Changes in test file demonstrate the fixed behaviour.

4701:1b5da965d72a

  | @  1:5f6d8a4bf34a[] (obsolete/draft) added b
  |/
  o  0:9092f1db7931[] (draft) added a
  
  $ hg prune -r "desc('added c')"
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  working directory is now at 9092f1db7931
  1 changesets pruned

  $ hg par
  0:9092f1db7931[] (draft) added a
XXX: it doesn't make sense to update to "added a"; parent should be "added b"

  $ cd ..

4702:fcecbb1261f2

  | @  1:5f6d8a4bf34a[] (obsolete/draft) added b
  |/
  o  0:9092f1db7931[] (draft) added a
  
  $ hg prune -r "desc('added c')"
  1 changesets pruned

  $ hg par
  1:5f6d8a4bf34a[] (obsolete/draft) added b
  working directory parent is obsolete! (5f6d8a4bf34a)
  (use 'hg evolve' to update to its parent successor)

  $ cd ..