Messages per Month
|Joseph Turian||Apr 17, 2008 11:43 am|
|Martin Marques||Apr 17, 2008 12:23 pm|
|Joseph Turian||Apr 17, 2008 12:29 pm|
|Martin Marques||Apr 17, 2008 12:51 pm|
|Joseph Turian||Apr 17, 2008 2:24 pm|
|Martin Geisler||Apr 17, 2008 2:31 pm|
|Joseph Turian||Apr 18, 2008 11:14 am|
|Joseph Turian||Apr 18, 2008 11:28 am|
|Martin Marques||Apr 18, 2008 12:47 pm|
|Martin Geisler||Apr 19, 2008 11:39 am|
|Subject:||abort: push creates new remote heads!|
|From:||Martin Marques (mar...@marquesminen.com.ar)|
|Date:||Apr 17, 2008 12:51:36 pm|
Joseph Turian wrote:
Could you please explain what is going on here? I would like to understand.
Let'ssee if I can clear things up.
On Thu, Apr 17, 2008 at 3:24 PM, Martin Marques <martin at marquesminen.com.ar <mailto:martin at marquesminen.com.ar>> wrote:
Joseph Turian wrote:
Help! I am using mercurial to do development with several other persons. I didn't early enough, and now my repository is in a state from which I am not sure how to recover:
turian at grenat:~/dev/theano 1$ hg push pushing to ssh://[...] searching for changes abort: push creates new remote heads! (did you forget to merge? use push -f to force)
Here there is a branch on the remote hg that you haven't pulled yet.
turian at grenat:~/dev/theano 1$ hg pull pulling from ssh://[...] searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) turian at grenat:~/dev/theano 1$ hg update abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
You pulled the branch that is on the remote hg, and so you have to merge it with your branch.
turian at grenat:~/dev/theano 1$ hg merge abort: outstanding uncommitted changes
Apparently you had uncommited changes (check with *hg st -m*) and so the merge aborts (it could come out with conflicts on files that have to be merged and have uncommitted changes).
$ cd .. $ hg clone theano theano-merge $ cd theano-merge $ hg merge $ hg ci $ cd ../theano $ hg pull ../theano-merge
What I do is clone the local hg to another directory. This will only copy commited changesets, so the merge can be done with no problem.
After that you can pull the changes back and check for those *uncommited* changes.