Obj = _peerlookup(path).instance(ui, path, create)įile "/Applications/SourceTree.app/Contents/Resources/mercurial_local/mercurial/hg.py", line 89, in _peerlookupįile "/Applications/SourceTree.app/Contents/Resources/mercurial_local/hgext/hgsubversion/_init_. Sys.exit((dispatch(request(sys.argv)) or 0) & 255)įile "/Applications/SourceTree.app/Contents/Resources/mercurial_local/mercurial/dispatch.py", line 71, in dispatchįile "/Applications/SourceTree.app/Contents/Resources/mercurial_local/mercurial/dispatch.py", line 140, in _runcatchįile "/Applications/SourceTree.app/Contents/Resources/mercurial_local/mercurial/dispatch.py", line 817, in _dispatchįile "/Applications/SourceTree.app/Contents/Resources/mercurial_local/mercurial/hg.py", line 128, in repositoryįile "/Applications/SourceTree.app/Contents/Resources/mercurial_local/mercurial/hg.py", line 115, in _peerorrepo Most likely, this means the patch was already applied and you want to drop it using git rebase -skip. As the error message from git rebase -continuesuggests, you asked git to apply a patch that results in an empty patch. ** Extensions loaded: strip, mq, rebase, transplant, extdiff, progress, sourcetree_auth, sourcetree_checklink, hgattic, hgflow, gpg, fetchįile "/Applications/SourceTree.app/Contents/Resources/mercurial_local/hg_local", line 35, in įile "/Applications/SourceTree.app/Contents/Resources/mercurial_local/mercurial/dispatch.py", line 28, in run (git rebase -continue) or abort it (git rebase -abort). ** Mercurial Distributed SCM (version 3.2.3) With rebasing you’re creating a nice chain of commits tracing right back to the start, but, after a while, it. ** Python 2.7.6 (default, Sep 9 2014, 15:04:36) Now that I’ve explained the point of Rebase, let’s move on to Squash. ** If that fixes the bug please report it to the extension author. ** Please disable sourcetree_auth and try your action again. A technical video for developers of MatrixPilot about Rebasing. (Sourcetree can do this, but its unreliable and usually doesnt give the correct result). ** which supports versions unknown of Mercurial. Rebasing Branches of MatrixPilot using Git, Github and SourceTree. Ctrl + Click any two commits to see a diff of them. ** Unknown exception encountered with possibly-broken third-party extension sourcetree_auth 'hg status' failed with code 1:'*** failed to import extension hgext.hgsubversion from /Applications/SourceTree.app/Contents/Resources/mercurial_local/hgext/hgsubversion: 'module' object has no attribute 'canonpath'
0 Comments
Leave a Reply. |