# HG changeset patch # User Matt Harbison # Date 1668798236 18000 # Node ID 7ddbb3623a07dbe88d16511ce711dca45636d0b4 # Parent 2af928d69e8e07200c5ab3f794584ad8880fd39f tests: demonstrate a bug blocking a redundant branch close diff -r 2af928d69e8e -r 7ddbb3623a07 tests/test-branches.t --- a/tests/test-branches.t Thu Nov 17 16:31:52 2022 +0000 +++ b/tests/test-branches.t Fri Nov 18 14:03:56 2022 -0500 @@ -292,6 +292,26 @@ [10] $ hg commit -d '9 0' --close-branch -m 're-closing this branch' b + $ echo baz > b + $ hg log -r . + changeset: 14:acc63dd7207f + branch: b + tag: tip + user: test + date: Thu Jan 01 00:00:09 1970 +0000 + summary: re-closing this branch + + $ hg commit -d '9 0' --close-branch -m 'empty re-closing this branch' -X b + $ hg log -r . + changeset: 15:3c41ebd8ea8b + branch: b + tag: tip + user: test + date: Thu Jan 01 00:00:09 1970 +0000 + summary: empty re-closing this branch + + $ hg revert b + $ hg debugstrip --rev 13: --no-backup 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg revert --all --no-backup