view tests/test-issue5979.t @ 45085:a0192a03216d

rebase: remove now unnecessary logic to allow empty commit when branch changes This was a workaround for a bug in the empty commit check in repo.commit(), where the parent branch name was incorrectly compared with the wdir branch name instead of the branch name passed via `extra`. The bug was fixed in D8724. The workaround was introduced in b2415e94b2f5. Differential Revision: https://phab.mercurial-scm.org/D8725
author Manuel Jacob <me@manueljacob.de>
date Thu, 09 Jul 2020 07:00:32 +0200
parents ef6cab7930b3
children
line wrap: on
line source

  $ hg init r1
  $ cd r1
  $ hg ci --config ui.allowemptycommit=true -m c0
  $ hg ci --config ui.allowemptycommit=true -m c1
  $ hg ci --config ui.allowemptycommit=true -m c2
  $ hg co -q 0
  $ hg ci --config ui.allowemptycommit=true -m c3
  created new head
  $ hg co -q 3
  $ hg merge --quiet
  $ hg ci --config ui.allowemptycommit=true -m c4

  $ hg log -G -T'{desc}'
  @    c4
  |\
  | o  c3
  | |
  o |  c2
  | |
  o |  c1
  |/
  o  c0
  

  >>> from mercurial import hg
  >>> from mercurial import ui as uimod
  >>> repo = hg.repository(uimod.ui())
  >>> for anc in repo.changelog.ancestors([4], inclusive=True):
  ...   print(anc)
  4
  3
  2
  1
  0