opendev/gerrit
Code Issues Proposed changes

Added explanation for "no common ancestry" error

Browse Source 
Added a documentation page that explains the
"no common ancestry" error.

Change-Id: I89335d9491413e1b42679024950307bb466f440f
Signed-off-by: Edwin Kempin <edwin.kempin@gmail.com>
This commit is contained in:
Edwin Kempin 2011-01-25 15:33:40 +01:00
parent 84739ac801
commit 5e95534196
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/error-messages.txt
View File

@ -14,6 +14,7 @@ Error Messages
* link:error-invalid-changeid.html[invalid Change-Id line format in commit message]
* link:error-missing-changeid.html[missing Change-Id in commit message]
* link:error-multiple-changeid-lines.html[multiple Change-Id lines in commit message]
* link:error-no-common-ancestry.html[no common ancestry]
* link:error-no-new-changes.html[no new changes]
* link:error-not-a-gerrit-project.html[not a Gerrit project]
* link:error-not-valid-ref.html[not valid ref]

20
Documentation/error-no-common-ancestry.txt Normal file
View File

@ -0,0 +1,20 @@
no common ancestry
==================
With this error message Gerrit rejects to push a commit for code
review if the pushed commit and the commit at the tip of the target
branch do not have a common ancestry.
This means that your local development history and the development
history of the branch to which the push is done are completely
independent (they have completely independent commit graphs).
This error usually occurs if you do a change in one project and then
you accidentally push the commit to another project for code review.
To fix the problem you should check your push specification and
verify that you are pushing the commit to the correct project.
GERRIT
------
Part of link:error-messages.html[Gerrit Error Messages]