comparison tests/test-branches.t @ 49320:3d3d7fc6035a stable

commit: allow to close branch when committing change over a closed head

Otherwise, an explicit other commit become necessary, which seems both silly and
verbose.

This is useful when merging closed heads on the same branches, for example when
merging multiple repositories together.

49315:2f326ea19fbc

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg commit -d '9 0' --close-branch -m 'close this part branch too'
  $ hg commit -d '9 0' --close-branch -m 're-closing this branch'
  abort: current revision is already a branch closing head
  [10]

  $ hg log -r tip --debug
  changeset:   12:e3d49c0575d8fc2cb1cd6859c747c14f5f6d499f
  branch:      b
  tag:         tip

49320:3d3d7fc6035a

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg commit -d '9 0' --close-branch -m 'close this part branch too'
  $ hg commit -d '9 0' --close-branch -m 're-closing this branch'
  abort: current revision is already a branch closing head
  [10]

  $ echo foo > b
  $ hg commit -d '9 0' --close-branch -m 're-closing this branch'

  $ echo bar > b
  $ hg commit -d '9 0' --close-branch -m 're-closing this branch' bh1
  abort: current revision is already a branch closing head
  [10]
  $ hg commit -d '9 0' --close-branch -m 're-closing this branch' b

  $ hg debugstrip --rev 13: --no-backup
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg revert --all --no-backup

  $ hg log -r tip --debug
  changeset:   12:e3d49c0575d8fc2cb1cd6859c747c14f5f6d499f
  branch:      b
  tag:         tip