can't push even if branch merged

Piers Barber piers at stonesflock.co.uk
Thu Aug 5 20:08:28 UTC 2010


hi

i suspect my problem here is my understanding of how Hg works

i make a repo and commit a couple of changes:

fatcat[pb] mkdir hack
fatcat[pb] cd hack
fatcat[pb] hg init source1
fatcat[pb] cd source1
fatcat[pb] echo a > a
fatcat[pb] hg add a
fatcat[pb] hg ci -m"a1" a
fatcat[pb] echo b >> a
fatcat[pb] hg ci -m"a2"

now i clone the repo in source1 and have a source2 and immediately work on mybranch in source2

fatcat[pb] cd ..
fatcat[pb] hg clone source1 source2
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
fatcat[pb] cd source2
fatcat[pb] hg branch mybranch
marked working directory as branch mybranch
fatcat[pb] echo c >> a
fatcat[pb] hg ci -m"c1"
fatcat[pb] echo d >> a
fatcat[pb] hg ci -m"c2"

i switch back to default and merge mybranch. i commit.

fatcat[pb] hg up default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
fatcat[pb] hg merge mybranch
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
fatcat[pb] hg ci -m"merged mybranch"
fatcat[pb] hg push
pushing to /home/pb/hack/source1
searching for changes
abort: push creates new remote branch 'mybranch'!
(did you forget to merge? use push -f to force)
fatcat[pb] cat a
a
b
c
d
fatcat[pb] hg heads
changeset:   4:aa91f18a56e8
tag:         tip                                                                                                                                                                      
parent:      1:9faa11d934ce                                                                                                                                                           
parent:      3:356092e516ea                                                                                                                                                           
user:        Piers Barber <piers.barber at imgtec.com>                                                                                                                                   
date:        Thu Aug 05 20:52:42 2010 +0100                                                                                                                                           
summary:     merged mybranch     

why do i get the push error? i did merge and i did commit.

any help greatly appreciated!

--
Piers Barber



More information about the Mercurial mailing list