push aborts for new branch even if no heads
Luke Opperman
loppear at gmail.com
Thu Nov 12 16:16:48 CST 2009
>> Closed branches should be pushable with no flag at all, and not affect
"tip"
>> unless "tip" happens to be on the closed branch.
>
> This works well today, with hg 1.3.1, by using --close-branch and then
> merging the closing commit into some other branch.
That's not what I see if I change my original motivating example to close
the branch before merging, still aborts for pushing a new remote branch:
$ hg co t
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --close-branch -m "close"
$ hg ll
@ 2[tip] 5d8721c45d88 2009-11-12 16:10 -0600 luke
| close
|
o 1 f3befbe2f07b 2009-11-12 10:52 -0600 luke
| add b
|
o 0 de100d2bcc20 2009-11-12 10:50 -0600 luke
one
$ hg co default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge t
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg commit -m "merge"
$ hg ll
@ 3[tip]:0,2 2b9964be5e69 2009-11-12 16:10 -0600 luke
|\ merge
| |
| o 2 5d8721c45d88 2009-11-12 16:10 -0600 luke
| | close
| |
| o 1 f3befbe2f07b 2009-11-12 10:52 -0600 luke
|/ add b
|
o 0 de100d2bcc20 2009-11-12 10:50 -0600 luke
one
$ hg branches
default 3:2b9964be5e69
$ hg push ../b
pushing to ../b
searching for changes
abort: push creates new remote branch 't'!
(did you forget to merge? use push -f to force)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20091112/f214c5f3/attachment.htm>
More information about the Mercurial-devel
mailing list