tree 9e12c76532af7eebe67d462d215740b5e2953d8c
parent eb7af87bcfc67798b58a99422988b9c368d7d642
author Shawn O. Pearce <sop@google.com> 1240327592 -0700
committer Shawn O. Pearce <sop@google.com> 1240327686 -0700

Fix 'repo sync' rebase logic on a published branch

If the current branch is published, but all published commits are
merged into the manifest revision, but there is also at least one
unpublished commit on the current branch, we should rebase the
unpublished commit, rather than creating a merge commit.

Signed-off-by: Shawn O. Pearce <sop@google.com>