Mercurial > hg

comparison tests/test-branches.t @ 49617:7ddbb3623a07 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: demonstrate a bug blocking a redundant branch close
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 18 Nov 2022 14:03:56 -0500
parents 3d3d7fc6035a
children 3adca6eb6659
comparison
equal deleted inserted replaced
49616:2af928d69e8e 49617:7ddbb3623a07
289 $ echo bar > b 289 $ echo bar > b
290 $ hg commit -d '9 0' --close-branch -m 're-closing this branch' bh1 290 $ hg commit -d '9 0' --close-branch -m 're-closing this branch' bh1
291 abort: current revision is already a branch closing head 291 abort: current revision is already a branch closing head
292 [10] 292 [10]
293 $ hg commit -d '9 0' --close-branch -m 're-closing this branch' b 293 $ hg commit -d '9 0' --close-branch -m 're-closing this branch' b
294
295 $ echo baz > b
296 $ hg log -r .
297 changeset: 14:acc63dd7207f
298 branch: b
299 tag: tip
300 user: test
301 date: Thu Jan 01 00:00:09 1970 +0000
302 summary: re-closing this branch
303
304 $ hg commit -d '9 0' --close-branch -m 'empty re-closing this branch' -X b
305 $ hg log -r .
306 changeset: 15:3c41ebd8ea8b
307 branch: b
308 tag: tip
309 user: test
310 date: Thu Jan 01 00:00:09 1970 +0000
311 summary: empty re-closing this branch
312
313 $ hg revert b
294 314
295 $ hg debugstrip --rev 13: --no-backup 315 $ hg debugstrip --rev 13: --no-backup
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 316 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
297 $ hg revert --all --no-backup 317 $ hg revert --all --no-backup
298 318