Can't push to github, local out of sync with remote
I amended the changeset a few times, did the git-clean, tried to push.
Not sure what additional info might be useful. Been working fine. Will try to delete offending branch on github and push. I amended the changeset a few times, did the git-clean, tried to push.
$ hg --version -v
Mercurial Distributed SCM (version 5.6)
Enabled extensions:
convert internal
eol internal
evolve external 10.1.0
extdiff internal
graphlog internal
hggit external 0.9.0 (dulwich 0.19.16)
histedit internal
purge internal
rebase internal
share internal
strip internal
topic external 0.20.0
transplant internal
/f/repos/swingset/swingset/swingset
$ hg git-clean
git commit map cleaned
/f/repos/swingset/swingset/swingset
$ hg push -f -r SSComboBoxHandleNull
pushing to git+ssh://git@github.com:errael/swingset.git
searching for changes
abort: branch 'refs/heads/SSComboBoxHandleNull' changed on the server, please pull and merge before pushing
/f/repos/swingset/swingset/swingset
$ hg pull
pulling from git://github.com/errael/swingset.git
importing git objects into hg
abort: filtered revision 'a390eeabca45f240279057fc0a93143adc42ac74'!
/f/repos/swingset/swingset/swingset
$ hg log -r a390eeabca45f240279057fc0a93143adc42ac74
abort: hidden revision 'a390eeabca45f240279057fc0a93143adc42ac74' was rewritten as: dd6b47375b57!
(use --hidden to access hidden revisions)
/f/repos/swingset/swingset/swingset
$ hg log -r dd6b47375b57
changeset: 813:dd6b47375b57
bookmark: SSComboBoxHandleNull
parent: 811:00d99d14caba
user: Ernie Rael <errael@raelity.com>
date: Fri Dec 11 06:50:02 2020 +0000
summary: SSComboBox handle allow null. getAllowNull() checks metadata.
/f/repos/swingset/swingset/swingset
$ hg glog
o changeset: 813:dd6b47375b57
| bookmark: SSComboBoxHandleNull
| parent: 811:00d99d14caba
| user: Ernie Rael <errael@raelity.com>
| date: Fri Dec 11 06:50:02 2020 +0000
| summary: SSComboBox handle allow null. getAllowNull() checks metadata.
|
o changeset: 811:00d99d14caba
| bookmark: master
| tag: upstream/master
| user: bpangburn <swingset@pangburngroup.com>
| date: Fri Dec 11 13:14:08 2020 -0600
| summary: POM changes for migration to github