I'm not sure yet if this error code is emitted from BC or Mercurial (HG), but doing a 3-way merge shows this in the terminal. The merge, however, succeeds (e.g. BC shows the conflicts, and my resolution is written to disk).
My .hgrc is like the following:
Example repos are attached (they just have a single text file with conflicts).
For example, in repo1, <hg pull -u ../repo2>, <hg merge>, pick one side or the other, and hit Cmd+S to save. The errors are printed at this point.
Code:
➜ repo1 hg merge merging file.txt Error: failed with result -9866 Error: failed with result -9866 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)
Code:
[ui] username = ... editor = emacs style = ... merge = bdiff [http_proxy] host = ... [extensions] mq = purge = graphlog = extdiff = [extdiff] cmd.bdiff = /Applications/Beyond Compare.app/Contents/MacOS/BCompare opts.bdiff = -ro [merge-tools] bdiff.executable = /Applications/Beyond Compare.app/Contents/MacOS/BCompare bdiff.args = $local $other $base $output bdiff.priority = 1 bdiff.premerge = True bdiff.gui = True
For example, in repo1, <hg pull -u ../repo2>, <hg merge>, pick one side or the other, and hit Cmd+S to save. The errors are printed at this point.
Comment