Skip to content
This repository has been archived by the owner on Jul 24, 2020. It is now read-only.

Uncomitting locally prevents pushing #263

Closed
alexreg opened this issue Sep 10, 2013 · 7 comments
Closed

Uncomitting locally prevents pushing #263

alexreg opened this issue Sep 10, 2013 · 7 comments

Comments

@alexreg
Copy link
Contributor

alexreg commented Sep 10, 2013

Even specifying the force option doesn't seem to help...

alex-mbp:pdfmarks alex$ hg push -f gh
pushing to git+ssh://git@github.com/alexreg/pdfmarks.git
["git-receive-pack '/alexreg/pdfmarks.git'"]
searching for changes
abort: refs/heads/master changed on the server, please pull and merge before pushing

Any chance you could fix this for the next release? Until then, I'd be grateful to hear of a work-around.

@durin42
Copy link
Collaborator

durin42 commented Sep 10, 2013

Do you have a bookmark named 'master'? If not, set one, that may help.

Otherwise, I'm not sure what's going on.

@alexreg
Copy link
Contributor Author

alexreg commented Sep 10, 2013

I do, yeah. Pushing is normally fine, but not when I'm missing a revision in the local Hg branch that doesn't exist in the remote Git branch.

@alexreg
Copy link
Contributor Author

alexreg commented Sep 10, 2013

Okay, so I just tried pushing to an empty local Git repo, and it still fails. Something very odd is going on here.

alex-mbp:pdfmarks alex$ hg push --force ../pdfmarks.git/
pushing to ../pdfmarks.git/
searching for changes
adding objects
abort: git remote error: refs/heads/master failed to update

@alexreg
Copy link
Contributor Author

alexreg commented Sep 11, 2013

Well, any thoughts?

@durin42
Copy link
Collaborator

durin42 commented Sep 11, 2013

Afraid not.

@alexreg
Copy link
Contributor Author

alexreg commented Sep 12, 2013

This seems to be related to #262, since I get "0 commits found" when I run hg push -f -v gh. Hmm.

@alexreg
Copy link
Contributor Author

alexreg commented Sep 13, 2013

Looks like a dulwich bug. If you use dulwich 0.9.1, it's gone, and so is that other issue... I'll submit a patch presently!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants