[issue450] push -r warns about remote head creation even if no heads will be created

Kyle Butt mercurial-bugs at selenic.com
Thu Dec 14 18:58:57 CST 2006


New submission from Kyle Butt <kylebutt at gmail.com>:

Attached is transcript showing the error for a simple case
using mercurial version: e96f97ca0358

----------
files: mercurial_error.txt
messages: 2520
nosy: kylebutt
priority: bug
status: unread
title: push -r warns about remote head creation even if no heads will be created

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue450>
____________________________________________________
-------------- next part --------------
kyle at North:~/tmp>mkdir src
kyle at North:~/tmp>cd src
kyle at North:~/tmp/src>hg init
kyle at North:~/tmp/src>echo "hello" >> a
kyle at North:~/tmp/src>hg add 
adding a
kyle at North:~/tmp/src>hg ci -m "testing selective push error message"
kyle at North:~/tmp/src>cd ..
kyle at North:~/tmp>hg clone src dest
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
kyle at North:~/tmp>cd src
kyle at North:~/tmp/src>hg branch work
kyle at North:~/tmp/src>echo "work" >> a
kyle at North:~/tmp/src>hg ci -m "do some work"
kyle at North:~/tmp/src>echo "more work" >> a
kyle at North:~/tmp/src>hg ci -m "do some more work"
kyle at North:~/tmp/src>hg log
changeset:   2:e397036076dd
branch:      work
tag:         tip
user:        "Kyle Butt <kylebutt at gmail.com>"
date:        Thu Dec 14 17:56:42 2006 -0700
summary:     do some more work

changeset:   1:0cda2e4ecd2c
branch:      work
user:        "Kyle Butt <kylebutt at gmail.com>"
date:        Thu Dec 14 17:56:27 2006 -0700
summary:     do some work

changeset:   0:d1ec81b11959
user:        "Kyle Butt <kylebutt at gmail.com>"
date:        Thu Dec 14 17:55:45 2006 -0700
summary:     testing selective push error message

kyle at North:~/tmp/src>hg up 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
kyle at North:~/tmp/src>hg branch main
kyle at North:~/tmp/src>hg revert -r 2 --all
reverting a
kyle at North:~/tmp/src>hg ci -m "bring all work from the work branch"
kyle at North:~/tmp/src>hg branches
main                           3:4e365ecf180a
work                           2:e397036076dd
kyle at North:~/tmp/src>hg branch work
kyle at North:~/tmp/src>hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
kyle at North:~/tmp/src>hg ci -m "merge with main, all changes pulled into main"
kyle at North:~/tmp/src>hg outgoing -r main ../dest
searching for changes
changeset:   3:4e365ecf180a
branch:      main
parent:      0:d1ec81b11959
user:        "Kyle Butt <kylebutt at gmail.com>"
date:        Thu Dec 14 17:58:19 2006 -0700
summary:     bring all work from the work branch

kyle at North:~/tmp/src>hg push -r main ../dest
pushing to ../dest
searching for changes
abort: push creates new remote branches!
(did you forget to merge? use push -f to force)
kyle at North:~/tmp/src>hg push -f -r main ../dest
pushing to ../dest
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
kyle at North:~/tmp/src>cd ../dest
kyle at North:~/tmp/dest>hg heads
changeset:   1:4e365ecf180a
branch:      main
tag:         tip
user:        "Kyle Butt <kylebutt at gmail.com>"
date:        Thu Dec 14 17:58:19 2006 -0700
summary:     bring all work from the work branch


More information about the Mercurial-devel mailing list