Lines Matching refs:merge
17 """Merge Chromium into the Android tree."""
139 root_sha1: The git hash to merge in the root repository.
140 target: The target branch to merge to.
150 # sense for a Chromium tree to know about this merge.
156 branch_name = 'merge-from-chromium-%s' % version
195 # Merge conflicts make git merge return 1, so ignore errors
196 merge_common.GetCommandStdout(['git', 'merge', '--no-commit', sha1],
199 'Merge %s from %s at %s\n\n%s' % (path, url, sha1, AUTOGEN_MESSAGE),
202 logging.debug('No new commits to merge in project %s', path)
220 # Merge conflicts make git merge return 1, so ignore errors
221 merge_common.GetCommandStdout(['git', 'merge', '--no-commit', merged_sha1],
224 'Merge Chromium at %s\n\n%s'
311 'Update makefiles after merge of Chromium at %s\n\n%s' %
342 'Update NOTICE file after merge of Chromium at %s\n\n%s'
353 root_sha1: The SHA1 of the main project (before the merge).
369 'Update LASTCHANGE file after merge of Chromium at %s\n\n%s'
406 'git', 'merge-base', '--is-ancestor', upstream, git_branch])
428 after the merge.
431 root_sha1: The abbrev sha1 in the Chromium git mirror to merge from.
432 release: The Chromium release version to merge from (e.g. "30.0.1599.20").
434 target: The target branch to merge to.
452 logging.info('No new commits to merge at %s (%s)', version, root_sha1)
457 # 1. Merge, accounting for excluded directories
478 src = 'merge-from-chromium-%s' % version
480 # case they already got updated by a previous (possibly failed?) merge, but
486 refspecs.insert(0, '+%s:master-chromium-merge' % src)
505 'as part of the merge. Also generates Android makefiles and '
511 help=('Merge to the specified chromium sha1 revision from ' +
512 SRC_GIT_BRANCH + ' branch. Default is HEAD, to merge from ToT.'))
516 help=('Merge to the specified chromium release buildspec (e.g., "30.0.'
529 help=('Push the result of a previous merge to the server. Note '
542 help=('Exit code to use if there are no changes to merge, for scripts.'))
