hg-git
hg-git copied to clipboard
Unable to push after rebase: unknown revision X
% hg push --rev . --force git+https://github.com/elifarley/orgecc-libcalltimer.git pushing to git+https://github.com/elifarley/orgecc-libcalltimer.git http authorization required for https://github.com/elifarley/orgecc-libcalltimer.git/info/refs realm: GitHub user: elifarley searching for changes unknown revision 'b8b60eadca08f713e79f4e5440b738bf3acf12d5'
I've got the same error when i'm trying to emulate my developing workflow. Just do the follow steps:
- Create git repository and create some git branch. (git init && git create -b mybranch)
- Clone git repository into mercurial repo. (hg clone git+ssh://...../repo myrepo)
- Switch to bookmark mybranch(git branch) and add some commits. (hg up mybranch && hg ci -m 'some changes')
- Rebase commits
- Try to push changes.
Actual result:
% hg push -v
pushing to /home/Temp/test/GIT_repo
searching for changes
abort: unknown revision 'c1e69fbcb5152c50836b491f34f19025e32af87e'!
Additional info: Mercurial Distributed SCM (version 3.7.3) dulwich - 0.12.0 (latest) hg-git 0.8.5
A Problem can be solved by follow command:
hg rebase -b
or add in .hgrc [default] rebase= --keepbranch