![]() |
|
|
Issue Type:
|
Bug
|
Assignee:
|
Nicolas De Loof
|
Components:
|
git |
Created:
|
30/Sep/14 3:30 PM
|
Description:
|
We are using special merge simulator projects for feature branches where
the idea is that the feature branch is automatically merged onto the
master before compiling and testing it so that also the merging behavior
is verified. All of these projects are multi configuration jobs. So far
this worked quite well but since a few days we are noticing a weird
behavior:
In one of the feature branches we did some force pushing and after that
we noticed two error conditions.
1. The coordinator performed the merge successfully, which created a new
revision with hash 5af79d528388216aa25a24c27f0a16d8dc55bdb6. All slaves
of the multi configuration project then try to checkout that revision,
which obviously does not exist in their local repositories. Hence, they
end up with
2. After wiping the workspace of that job we ended up in a second error
condition already on the coordinator side:
It seems that the master cached the last revision (which it generated
locally, so it will never be available after pulling) and refused to
forget about this revision.
|
Environment:
|
Jenkins LTS on Debian Wheezy
Git client plugin 1.10.2
Git plugin 2.2.6
|
Project:
|
Jenkins
|
Priority:
|
Minor
|
Reporter:
|
Johannes Wienke
|
|
|
|
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira
|
--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to
jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit
https://groups.google.com/d/optout.