|

»

»

»

Nothing to merge, but hg push fails - help!

View: New views

3 Messages — Rating Filter: Alert me

	Nothing to merge, but hg push fails - help! by David Van Couvering-2 :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message 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 -- David W. Van Couvering http://davidvancouvering.blogspot.com
	Re: Nothing to merge, but hg push fails - help! by Tomas Mysik :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message 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@...
	Re: Nothing to merge, but hg push fails - help! by David Van Couvering-2 :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message Yes, I just saw that too. Doh! Thanks, David On Tue, May 6, 2008 at 9:52 AM, Tomas Mysik <Tomas.Mysik@...> wrote: 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@... -- David W. Van Couvering http://davidvancouvering.blogspot.com