Re: Nothing to merge, but hg push fails - help!

Dne úterý 06 května 2008 David Van Couvering napsal(a):

> OK, Uncle!  I give in!  What am I supposed to do here?
>
> Meanwhile, I'm going to transplant my changes to a fresh pull...  Sigh...
>
> David-Van-Couverings-Laptop:main David$ hg fetch
> pulling from /Users/David/code/netbeans/trunk/main
> searching for changes
> no changes found
> David-Van-Couverings-Laptop:main David$ hg push
> pushing to https://davidvc:***@hg.netbeans.org/main/
> searching for changes
> abort: push creates new remote branches!
> (did you forget to merge? use push -f to force)
> David-Van-Couverings-Laptop:main David$ hg fetch
> pulling from /Users/David/code/netbeans/trunk/main
> searching for changes
> no changes found
> David-Van-Couverings-Laptop:main David$ hg push
> pushing to https://davidvc:***@hg.netbeans.org/main/
> searching for changes
> abort: push creates new remote branches!
> (did you forget to merge? use push -f to force)
> David-Van-Couverings-Laptop:main David$ hg status
> David-Van-Couverings-Laptop:main David$ hg merge
> abort: there is nothing to merge

You are pulling from

/Users/David/code/netbeans/trunk/main

but trying to push into

https://davidvc:***@hg.netbeans.org/main/

Tomas
--
Tomas Mysik
tomas.mysik@...