Issue 3141045: cros_mark_as_stable: delete merge_branch if it already exists

Issue 3141045: cros_mark_as_stable: delete merge_branch if it already exists (Closed)

Created:
10 years, 4 months ago by Mandeep Singh Baines

Modified:
9 years, 7 months ago

Reviewers:
petkov, anush, sosa

CC:
chromium-os-reviews_chromium.org, Mandeep Singh Baines, sosa

Base URL:
http://git.chromium.org/git/crosutils.git

Visibility:
Public.

Description

cros_mark_as_stable: delete merge_branch if it already exists Fixes issue with pfbb where commits aren't getting squashed BUG=6102 TEST=Ran the code. Change-Id: Ibbcb8882ee13abf3a7c283bb0d248eef8db31cb8

Patch Set 1 #

Total comments: 1

Patch Set 2 : Fixed. #

Total comments: 3

Created: 10 years, 4 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+7 lines, -0 lines)			Patch
	M	cros_mark_as_stable.py	View	1	2 chunks	+7 lines, -0 lines	3 comments	Download

Messages

Total messages: 7 (0 generated)

Expand Messages | Collapse Messages

petkov

http://codereview.chromium.org/3141045/diff/1/2 File cros_mark_as_stable.py (right): http://codereview.chromium.org/3141045/diff/1/2#newcode142 cros_mark_as_stable.py:142: _RunCommand('git branch -D %s' % merge_branch_name) fly-by -- Exists ...

10 years, 4 months ago (2010-08-25 23:23:34 UTC) #2

anush

LGTM On 2010/08/25 23:47:51, Mandeep Singh Baines wrote: > Fixed. PTAL.

10 years, 4 months ago (2010-08-26 01:52:15 UTC) #4

petkov

This issue is closed now but still... http://codereview.chromium.org/3141045/diff/6001/7001 File cros_mark_as_stable.py (right): http://codereview.chromium.org/3141045/diff/6001/7001#newcode113 cros_mark_as_stable.py:113: def _BranchExists(name): ...

10 years, 4 months ago (2010-08-26 03:39:35 UTC) #6

petkov

10 years, 4 months ago (2010-08-26 16:47:18 UTC) #7

http://codereview.chromium.org/3141045/diff/6001/7001
File cros_mark_as_stable.py (right):

http://codereview.chromium.org/3141045/diff/6001/7001#newcode145
cros_mark_as_stable.py:145: _RunCommand('git checkout -b %s %s' % (
Btw, this does emit a "fatal" message:

...
HEAD is now at 120e432... Add support for using overlay-specific portage profile
directories to setup_board
Switched to a new branch 'merge_branch'
fatal: git checkout: branch merge_branch already exists
Counting objects: 8, done.
...

On 2010/08/26 03:39:35, petkov wrote:
> This seems redundant with CreateBranch above. Does this reset the tracking
> branch somehow? It seems cleaner to:
> 
> - Delete merge_branch if it Exists.
> - Create a new merge branch (possibly by extending the CreateBranch method by
> adding an optional tracking branch).
>

Expand Messages | Collapse Messages