https://bugzilla.wikimedia.org/show_bug.cgi?id=64678
Bug ID: 64678
Summary: jenkins-bot reports spurious merge error when pushing
changes to one of the gerrit config branches
Product: Wikimedia
Version: wmf-deployment
Hardware: All
OS: All
Status: NEW
Severity: normal
Priority: Unprioritized
Component: Continuous integration
Assignee: [email protected]
Reporter: [email protected]
CC: [email protected], [email protected],
[email protected], [email protected]
Web browser: ---
Mobile Platform: ---
Steps to reproduce:
1. git fetch gerrit refs/meta/dashboards/custom
2. git checkout FETCH_HEAD
3. change stuff & commit
4. git push gerrit HEAD:refs/for/refs/meta/dashboards/custom
This pushes a new changeset into gerrit's special dashboard branch
(refs/meta/dashboards/custom). Could be done via git-review as well, but in my
experience it is not very reliable with gerrit's special config branches.
(Might be setting up things wrong - I described the setup steps in detail here:
http://lists.wikimedia.org/pipermail/multimedia/2014-April/000272.html )
Expected result: jenkins-bot ignores the change or marks as +2
Actual result: jenkins-bot marks as -2, claims a merge conflict (maybe tries to
merge into the wrong branch?)
Example: https://gerrit.wikimedia.org/r/#/c/130643/
--
You are receiving this mail because:
You are the assignee for the bug.
You are on the CC list for the bug.
_______________________________________________
Wikibugs-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
