comparison tests/test-histedit-obsolete.t @ 19473:10a0ae668fe6 stable

histedit: refuse to edit history that contains merges (issue3962)

19472:32e502b26983

  |
  o  10:40db8afa467b (public) c
  |
  o  0:cb9a9f314b8b (public) a
  
  $ cd ..

19473:10a0ae668fe6

  |
  o  10:40db8afa467b (public) c
  |
  o  0:cb9a9f314b8b (public) a
  
  $ hg co 18
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ echo wat >> wat
  $ hg add wat
  $ hg ci -m 'add wat'
  created new head
  $ hg merge 19
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ hg ci -m 'merge'
  $ echo not wat > wat
  $ hg ci -m 'modify wat'
  $ hg histedit 17
  abort: cannot edit history that contains merges
  [255]
  $ cd ..