Show More
@@ -2114,7 +2114,9 b' def _docommit(ui, repo, *pats, **opts):' | |||||
2114 | if repo[b'.'].closesbranch(): |
|
2114 | if repo[b'.'].closesbranch(): | |
2115 | # Not ideal, but let us do an extra status early to prevent early |
|
2115 | # Not ideal, but let us do an extra status early to prevent early | |
2116 | # bail out. |
|
2116 | # bail out. | |
2117 |
matcher = scmutil.match( |
|
2117 | matcher = scmutil.match( | |
|
2118 | repo[None], pats, pycompat.byteskwargs(opts) | |||
|
2119 | ) | |||
2118 | s = repo.status(match=matcher) |
|
2120 | s = repo.status(match=matcher) | |
2119 | if s.modified or s.added or s.removed: |
|
2121 | if s.modified or s.added or s.removed: | |
2120 | bheads = repo.branchheads(branch, closed=True) |
|
2122 | bheads = repo.branchheads(branch, closed=True) |
@@ -293,23 +293,9 b' verify update will accept invalid legacy' | |||||
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 |
|
294 | |||
295 | $ echo baz > b |
|
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 |
|
296 | $ hg commit -d '9 0' --close-branch -m 'empty re-closing this branch' -X b | |
305 | $ hg log -r . |
|
297 | abort: current revision is already a branch closing head | |
306 | changeset: 15:3c41ebd8ea8b |
|
298 | [10] | |
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 |
|
299 | $ hg revert b | |
314 |
|
300 | |||
315 | $ hg debugstrip --rev 13: --no-backup |
|
301 | $ hg debugstrip --rev 13: --no-backup |
General Comments 0
You need to be logged in to leave comments.
Login now