=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child =Software\Scooter Software\Beyond Compare 3 =$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo =-left $other -right $local -ancestor $base -merge $output =/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge =$parent $child -mode=diff2 -title1='$plabel1' -title2='$clabel' ![]() =Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge =$base $local $other -mode=merge3 -title0=base -title1=local -title2=other -to=$output =/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel' =/base:$base /mine:$local /theirs:$other /merged:$output =Software\Wow6432Node\Perforce\Environment =-nosplash -title1='$plabel1' -title2='$clabel' $parent $child =-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output =Software\Wow6432Node\SourceGear\SourceGear DiffMerge\ =Software\SourceGear\SourceGear DiffMerge\ =-title1 '$plabel1' $parent -title2 '$clabel' $child =-show-merged-pane -exit-with-merge-status -title1 local -title2 base -title3 other -merged-filename $output -merge $local $base $other =-L '$plabel1' $parent -L '$clabel' $child =-a -label='$plabel1' $parent -label='$clabel' $child ![]() =-label='local' $local -label='merged' $base -label='other' $other -o $output =$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"' =-L1 '$plabel1' -L2 '$clabel' $parent $child =-auto -L1 base -L2 local -元 other $base $local $other -o $output I get this same error when using ReviewBoard 1.7.25.īundle.mainreporoot=/home/oplx/rb_repo/hg0 Self._get_bottom_and_top_outgoing_revs_for_remote(rev='.')įile "/usr/local/lib/python2.7/dist-packages/RBTools-0.6-py2.7.egg/rbtools/clients/mercurial.py", line 401, in _get_bottom_and_top_outgoing_revs_for_remoteįile "/usr/local/lib/python2.7/dist-packages/RBTools-0.6-py2.7.egg/rbtools/clients/mercurial.py", line 383, in _get_remote_branchĮverything looks correct on my settings, but I am not sure what else I could be missing. ![]() Self._revisions = _revision_spec(self.cmd_args)įile "/usr/local/lib/python2.7/dist-packages/RBTools-0.6-py2.7.egg/rbtools/clients/mercurial.py", line 222, in parse_revision_spec Load_entry_point('RBTools=0.6', 'console_scripts', 'rbt')()įile "/usr/local/lib/python2.7/dist-packages/RBTools-0.6-py2.7.egg/rbtools/commands/main.py", line 134, in mainĬn_from_argv( args)įile "/usr/local/lib/python2.7/dist-packages/RBTools-0.6-py2.7.egg/rbtools/commands/_init_.py", line 422, in run_from_argvįile "/usr/local/lib/python2.7/dist-packages/RBTools-0.6-py2.7.egg/rbtools/commands/post.py", line 717, in mainįile "/usr/local/lib/python2.7/dist-packages/RBTools-0.6-py2.7.egg/rbtools/commands/post.py", line 619, in get_revisions > Making HTTP GET request to Traceback (most recent call last): > repository info: Path: /home/oplx/rb_repo/hg0, Base path: /, Supports changesets: False Use "hg help" for the full list of commands or "hg -v" for details Update update working directory (or switch revisions) Summary summarize working directory state Status show changed files in the working directory Remove remove the specified files on the next commit Push push changes to the specified destination Pull pull changes from the specified source Merge merge working directory with another revision Log show revision history of entire repository or files ![]() Init create a new repository in the given directory > Command exited with rc 255: Īdd add the specified files on the next commitĪnnotate show changeset information by line for each fileĬlone make a copy of an existing repositoryĬommit commit the specified files or all outstanding changesĮxport dump the header and diffs for one or more changesetsįorget forget the specified files on the next commit > Command exited with rc 128: įatal: Not a git repository (or any of the parent directories). Svn: E155007: '/home/oplx/rb_repo/hg0' is not a working copy > Current directory = /home/oplx/rb_repo/hg0 Unfortunately when I do an rbt post, I get this error:Īdding -debug at the end produces this output: I had installed ReviewBoard 2.0 and set it up to work with Mercurial.
0 Comments
Leave a Reply. |