Sublime merge git failed with exit code 128

#Sublime merge git failed with exit code 128 manual

diff -git a/Documentation/cmd-set-reviewers.txt b/Documentation/cmd-set-reviewers.txt Supported types: + - `code`:: Any project likely to contain user files. Supported types: + specified, defaults to `all`.

+++ -58,7 +58,7 Display only projects of the specified type. diff -git a/Documentation/cmd-ls-projects.txt b/Documentation/cmd-ls-projects.txt Note that this permission is named `submitAs` in the `nfig` file. +permission to submit changes on behalf of another user, by using the +`on_behalf_of` field in link:rest-api-changes.html#submit-input +when link:rest-api-changes.html#submit-change. References can have the current user name automatically included, creating dynamic access controls that change to match the currently -786,7 +789,9 Submit (On Behalf Of) This category permits users who have also been granted the `Submit` -permission to submit changes on behalf of another user. One quirk is that the +shortest possible pattern expansion must be a valid ref name: +thus `^refs/heads/.*/name` will fail because `refs/heads//name` +is not a valid reference, but `^refs/heads/.+/name` will work. See the library documentation for details on this -particular regular expression flavor. +++ -222,7 +222,10 link: is used for evaluation of regular expression access control rules. genrule( +genlicenses( name = 'js_licenses.txt', - cmd = '$(exe :gen_licenses) -partial ' - + '-classpath $(classpath %s) ' % JSUI - + JSUI + ' >$OUT', + opts =, + java_deps = JSUI_JAVA_DEPS, + non_java_deps = JSUI_NON_JAVA_DEPS, out = 'js_licenses.txt', ) diff -git a/Documentation/access-control.txt b/Documentation/access-control.txt +++ -1,12 +1,16 include_defs('//Documentation/fs') +include_defs('//Documentation/fs') include_defs('//tools/git.defs') DOC_DIR = 'Documentation' -JSUI = '//gerrit-gwtui:ui_module' -MAIN = '//gerrit-pgm:pgm' + +JSUI_JAVA_DEPS = +JSUI_NON_JAVA_DEPS = +MAIN_JAVA_DEPS = SRCS = glob(, excludes = ) + genasciidoc( name = 'html', out = 'html.zip', -28,21 +32,20 =, ) -genrule( +genlicenses( name = 'licenses.txt', - cmd = '$(exe :gen_licenses) -asciidoc ' - + '-classpath $(classpath %s) ' % MAIN - + '-classpath $(classpath %s) ' % JSUI - + MAIN + ' ' + JSUI + ' >$OUT', + opts =, + java_deps = JSUI_JAVA_DEPS + MAIN_JAVA_DEPS, + non_java_deps = JSUI_NON_JAVA_DEPS, out = 'licenses.txt', ) # Required by Google for gerrit-review. +++ -1,10 +1,12 gerrit_war(name = 'gerrit') -gerrit_war(name = 'headless', ui = None) -gerrit_war(name = 'chrome', ui = 'ui_chrome') -gerrit_war(name = 'firefox', ui = 'ui_firefox') -gerrit_war(name = 'safari', ui = 'ui_safari') +gerrit_war(name = 'gwtgerrit', ui = 'ui_dbg') +gerrit_war(name = 'headless', ui = None) +gerrit_war(name = 'chrome', ui = 'ui_chrome') +gerrit_war(name = 'firefox', ui = 'ui_firefox') +gerrit_war(name = 'safari', ui = 'ui_safari') +gerrit_war(name = 'polygerrit', ui = 'polygerrit') gerrit_war(name = 'withdocs', docs = True) gerrit_war(name = 'release', ui = 'ui_optdbg_r', docs = True, context =, visibility = ) diff -git a/Documentation/BUCK b/Documentation/BUCK +++ -5,10 +5,17 .=.Nullable .=disabled +.=enabled +.=do not generate .=1.7 +.=preserve .pliance=1.7 +.=generate +.=generate +.=generate .=enabled .=ignore +.=error .=ignore .=warning .=warning -17,6 +24,7 .=warning .=warning +.=error .РµСљСљlosedAutoCloseable=warning .=warning .=disabled -38,7 +46,7 .=ignore .=ignore .=disabled +.=enabled .=warning .=ignore .=disabled -91,6 +99,7 .=enabled .=disabled +.=ignore .=warning .=warning .=warning diff -git a/.watchmanconfig b/.watchmanconfig +++ -9,7 +9,8 Ostrovsky Deniz TР“Сrkoglu Deniz TuРњв‚¬rkoglu Deniz TР“Сrkoglu Deniz Turkoglu -Edwin Kempin Edwin Kempin +Edwin Kempin Edwin Kempin +Edwin Kempin Edwin Kempin Eryk Szymanski Fredrik Luthander Fredrik Luthander diff -git a/.settings/.prefs b/.settings/.prefs

+++ -7,7 +7,7 /test_site /.idea -/gerrit-parent.iml +*.iml *.sublime-* /gerrit-package-plugins /.buckconfig.local -15,6 +15,7 /buck-cache /buck-out +/eclipse-out /extras /local.properties *.pyc diff -git a/.mailmap b/.mailmap

#Sublime merge git failed with exit code 128 manual

git, eclipse-out + parallel_parsing = true mode = dir dir = ~/.gerritcodereview/buck-cache/locally-built-artifacts + + + excluded_labels = manual + + + jgit = lib/jgit + diff -git a/.buckversion b/.buckversion +++ -8,7 +8,9 = //Documentation:searchfree firefox = //:firefox gerrit = //:gerrit + gwtgerrit = //:gwtgerrit headless = //:headless + polygerrit = //:polygerrit release = //:release safari = //:safari soyc = //gerrit-gwtui:ui_soyc -19,11 +21,20 = //tools/fs - src_roots = java, resources + jar_spool_mode = direct_to_jar + src_roots = java, resources, src - ignore =.