cros_mark_as_stable.py - Issue 3066010: Add attempt to update remote and rebase before pushing

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cros_mark_as_stable.py

Issue 3066010: Add attempt to update remote and rebase before pushing (Closed) Base URL: ssh://git@chromiumos-git//crosutils.git

Patch Set: Created 10 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: cros_mark_as_stable.py

diff --git a/cros_mark_as_stable.py b/cros_mark_as_stable.py

index 91bd48f6f0fc5b8d38906850ff34323cab729374..e71813b022db3fb2d731b77876e8cabbee64401e 100755

--- a/cros_mark_as_stable.py

+++ b/cros_mark_as_stable.py

@@ -133,6 +133,8 @@ def _PushChange():

_STABLE_BRANCH_NAME))

_RunCommand('git cl upload --desc_from_logs -m "%s"' %

'Marking set of ebuilds as stable')

+ _RunCommand('git remote update')

+ _RunCommand('git rebase origin/master')

_RunCommand('git cl push %s' % gflags.FLAGS.push_options)

« no previous file with comments | « no previous file | no next file » | no next file with comments »