Make mark-merge-base cap the marked merge base at the real merge-base.

Make mark-merge-base cap the marked merge base at the real merge-base.

R=agable@chromium.org
BUG=

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=259697

[agable, 2014-03-26 21:00:09]

LGTM % nits.

https://codereview.chromium.org/212213004/diff/1/git_common.py
File git_common.py (right):

https://codereview.chromium.org/212213004/diff/1/git_common.py#newcode248
git_common.py:248: def check(*cmd, **kwargs):
Again with your overly terse naming.

https://codereview.chromium.org/212213004/diff/1/git_common.py#newcode344
git_common.py:344: logging.debug('Found ANCIENT pre-set merge-base for %s: %s',
branch, base)
Ancient? Could be off by just one commit made a couple hours ago. More like "out
of order".

[iannucci, 2014-03-26 21:26:02]

The CQ bit was checked by iannucci@chromium.org

[commit-bot: I haz the power, 2014-03-26 21:26:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/iannucci@chromium.org/212213004/40001

[iannucci, 2014-03-26 21:26:38]

https://chromiumcodereview.appspot.com/212213004/diff/1/git_common.py
File git_common.py (right):

https://chromiumcodereview.appspot.com/212213004/diff/1/git_common.py#newcode248
git_common.py:248: def check(*cmd, **kwargs):
On 2014/03/26 21:00:09, agable wrote:
> Again with your overly terse naming.

Done.

https://chromiumcodereview.appspot.com/212213004/diff/1/git_common.py#newcode344
git_common.py:344: logging.debug('Found ANCIENT pre-set merge-base for %s: %s',
branch, base)
On 2014/03/26 21:00:09, agable wrote:
> Ancient? Could be off by just one commit made a couple hours ago. More like
"out
> of order".

Done.

[commit-bot: I haz the power, 2014-03-26 21:27:48]

Change committed as 259697