My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 67: Changes should defer merging until merge commits are ready
4 people starred this issue and may be notified of changes. Back to list
Status:  Started
Owner:  sop@google.com


Sign in to add a comment
 
Reported by code-rev...@gtempaccount.com, Sep 24, 2009
Reported by Shawn Pearce <sop@google.com> on Mon Feb 09 10:41:31 PST 2009
Source: JIRA GERRIT-67
Affected Version: 2.0.3

If a change is an ancestor of a merge commit and the change is submitted into
the branch's submit queue we should prevent it from merging immediately and
try to wait for the merge commit to enter the submit queue too.

If a merge commit exists its likely the merge wasn't path clean, so we need
the merge commit anyway to get the change into the branch.

But even if the merge is path clean if a merge commit exists the author may
have explicitly created it, in which case they would prefer to have their own
merge commit used rather than a system generated one.
Sep 24, 2009
#1 sop+code@google.com
(No comment was entered for this change.)
Status: Accepted
Owner: ---
Sep 28, 2009
#2 sop+code@google.com
Partially addressed by Ibe66d7c844141ae101a0e145f201232d0fc91f4d.

In Ibe66d7 we wait 15 minutes to report a missing dependency.  This makes it
slightly cleaner to start at the tip of a chain of commits and walk backwards,
submitting each change before its ancestor is submitted.  If you can get all
of them submitted in under 15 minutes, no "missing dependency" errors are sent.

Unfortunately this still doesn't address the other direction, which is what the
issue is talking about in its description, so I'm leaving it open until that is
also dealt with.
Labels: FixedIn-2.0.22
Sep 28, 2009
#3 sop+code@google.com
(No comment was entered for this change.)
Owner: s...@google.com
Sep 28, 2009
#4 sop+code@google.com
(No comment was entered for this change.)
Status: Started
Nov 21, 2009
#5 sop@google.com
(No comment was entered for this change.)
Owner: s...@google.com
Sign in to add a comment

Powered by Google Project Hosting