| commit | 05f66b6836ffa4a0a309a4909cb3f8c4a7351727 | [log] [tgz] |
|---|---|---|
| author | Shawn O. Pearce <sop@google.com> | Tue Apr 21 08:26:32 2009 -0700 |
| committer | Shawn O. Pearce <sop@google.com> | Tue Apr 21 08:28:06 2009 -0700 |
| tree | 9e12c76532af7eebe67d462d215740b5e2953d8c | |
| parent | eb7af87bcfc67798b58a99422988b9c368d7d642 [diff] |
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>