| Issue 137: | Error out if a patch set replacement causes a change to depend upon itself | |
| Back to list |
Reported by Shawn Pearce <sop@google.com> on Wed Apr 15 12:31:02 PDT 2009
Source: JIRA GERRIT-137
Affected Version: 2.0.9
We have a had a few changes that show a dependency on themselves. Because of
that, the merge does not complete and the following error appears in the log:
"Change could not be merged because of a missing dependency. As soon
as its dependencies are submitted, the change will be submitted."
This happens when a user makes a second commit and replaces it onto the
change, e.g. they did:
$ git commit
$ repo upload
... some time later ...
$ git commit
$ repo upload --replace .
... specify the prior change ...
Now the change has 2 patch sets, and patch set 2's commit has patch set 1's
commit as its parent. What the user really wanted to do in this case was
squash the two commits together:
$ git rebase -i HEAD~2
... change 2nd pick to squash ...
$ repo upload --replace .
Sep 24, 2009
#1
code-rev...@gtempaccount.com
Sep 24, 2009
Update by Shawn Pearce <sop@google.com> on Wed Apr 15 12:46:14 PDT 2009 Fixed in version 2.0.10.
Status:
Fixed
Sep 24, 2009
Update by Shawn Pearce <sop@google.com> on Wed Apr 15 12:57:37 PDT 2009
Sep 25, 2009
(No comment was entered for this change.)
Labels:
FixedIn-2.0.10
Oct 25, 2012
(No comment was entered for this change.)
Status:
Released
|
|
| ► Sign in to add a comment |