bookmarks loose sync with git
Created originally on Bitbucket by Alex Rayne (Александр Литягин)
Hallow! i`ve got misimg sync with git repo easy way:
#!graph
5: < bookmark-side >
o
4: <bookmark-dev> |
| /
3: o<--------+
| |
2: o o <side-unsinc> <- this is pushed to git unsinced point
| |
1: o < gitrep/ bookmark-side > <- here is synced with git
| |
-
push branch bookmark-dev will push side-unsinc (r2:) revision. but git bookmark-side head not updates! it stay on synced point gitrep/ bookmark-side (r1:).
-
push branch bookmark-side will moves sync point in hggit to that revision (r5:). But git repo have no revisions after (r2:).
From this point git comes unsinc with local mirror, and pulling from it got messages like
unknown revision '4702d755792a3e9baf29eeb9cb6c280939e7881c'
push to this repo gives:
#!stacktrace
% hg outgoing --template {node}^M --force git+ssh://git@bitbucket.org:dsrclab/cc1310-firmware.git
comparing with git+ssh://git@bitbucket.org:dsrclab/cc1310-firmware.git
searching for changes
** Unknown exception encountered with possibly-broken third-party extension mercurial_extension_utils
** which supports versions unknown of Mercurial.
** Please disable mercurial_extension_utils and try your action again.
** If that fixes the bug please report it to the extension author.
** Python 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:53:40) [MSC v.1500 64 bit (AMD64)]
** Mercurial Distributed SCM (version 4.4.1)
** Extensions loaded: convert, evolve, extdiff, hggit, histedit, strip, mq, rebase, record, relink, shelve, transplant, eol, win32mbcs, mercurial_extension_utils, tortoisehg.util.hgcommands, tortoisehg.util.partialcommit, tortoisehg.util.pipeui, tortoisehg.util.win32ill, tortoisehg.util.hgdispatch
** Unknown exception encountered with possibly-broken third-party extension mercurial_extension_utils
** which supports versions unknown of Mercurial.
** Please disable mercurial_extension_utils and try your action again.
** If that fixes the bug please report it to the extension author.
** Python 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:53:40) [MSC v.1500 64 bit (AMD64)]
** Mercurial Distributed SCM (version 4.4.1)
** Extensions loaded: convert, evolve, extdiff, hggit, histedit, strip, mq, rebase, record, relink, shelve, transplant, eol, win32mbcs, mercurial_extension_utils, tortoisehg.util.hgcommands, tortoisehg.util.partialcommit, tortoisehg.util.pipeui, tortoisehg.util.win32ill, tortoisehg.util.hgdispatch
Traceback (most recent call last):
File "hg", line 61, in <module>
File "mercurial\dispatch.pyo", line 85, in run
File "mercurial\dispatch.pyo", line 173, in dispatch
File "mercurial\dispatch.pyo", line 313, in _runcatch
File "mercurial\dispatch.pyo", line 321, in _callcatch
File "mercurial\scmutil.pyo", line 154, in callcatch
File "mercurial\dispatch.pyo", line 303, in _runcatchfunc
File "mercurial\dispatch.pyo", line 940, in _dispatch
File "mercurial\dispatch.pyo", line 701, in runcommand
File "mercurial\dispatch.pyo", line 948, in _runcommand
File "mercurial\dispatch.pyo", line 937, in <lambda>
File "mercurial\util.pyo", line 1183, in check
File "mercurial\util.pyo", line 1183, in check
File "hgext\mq.pyo", line 3583, in mqcommand
File "mercurial\util.pyo", line 1183, in check
File "mercurial\commands.pyo", line 4726, in serve
File "mercurial\server.pyo", line 107, in runservice
File "mercurial\commandserver.pyo", line 339, in run
File "mercurial\commandserver.pyo", line 292, in serve
File "mercurial\commandserver.pyo", line 267, in serveone
File "mercurial\commandserver.pyo", line 250, in runcommand
File "mercurial\dispatch.pyo", line 173, in dispatch
File "mercurial\dispatch.pyo", line 313, in _runcatch
File "mercurial\dispatch.pyo", line 321, in _callcatch
File "mercurial\scmutil.pyo", line 154, in callcatch
File "mercurial\dispatch.pyo", line 303, in _runcatchfunc
File "tortoisehg\util\hgdispatch.pyo", line 23, in _dispatch
File "mercurial\dispatch.pyo", line 940, in _dispatch
File "mercurial\dispatch.pyo", line 701, in runcommand
File "mercurial\dispatch.pyo", line 948, in _runcommand
File "mercurial\dispatch.pyo", line 937, in <lambda>
File "mercurial\util.pyo", line 1183, in check
File "mercurial\util.pyo", line 1183, in check
File "hgext\mq.pyo", line 3583, in mqcommand
File "mercurial\util.pyo", line 1183, in check
File "mercurial\commands.pyo", line 3663, in outgoing
File "mercurial\hg.pyo", line 941, in outgoing
File "mercurial\hg.pyo", line 924, in _outgoing
File "hggit\__init__.pyo", line 298, in findcommonoutgoing
File "mercurial\discovery.pyo", line 49, in findcommonincoming
File "mercurial\treediscovery.pyo", line 68, in findcommonincoming
AttributeError: 'obscacherepo' object has no attribute 'branches'
cmdserver: процесс завершился неожиданно с кодом 255