https://bugzilla.wikimedia.org/show_bug.cgi?id=37942
Web browser: ---
Bug #: 37942
Summary: prevents Jenkins from conflicting on release note
files
Product: Wikimedia
Version: unspecified
Platform: All
OS/Version: All
Status: NEW
Severity: normal
Priority: Unprioritized
Component: Testing Infrastructure
AssignedTo: wikibugs-l@lists.wikimedia.org
ReportedBy: has...@free.fr
CC: has...@free.fr, innocentkil...@gmail.com
Classification: Unclassified
Mobile Platform: ---
When jenkins fetch a change to run test on, it attempts a merge against latest
master. We often end up with a conflict in the release note files which are not
really relevant to tests. Example:
21:01:45 + git merge FETCH_HEAD
21:01:45 Auto-merging RELEASE-NOTES-1.20
21:01:45 CONFLICT (content): Merge conflict in RELEASE-NOTES-1.20
21:01:45 Auto-merging languages/messages/MessagesEn.php
21:01:45 Auto-merging languages/messages/MessagesQqq.php
21:01:45 Automatic merge failed; fix conflicts and then commit the result.
21:01:45 Build step 'Execute shell' marked build as failure
21:01:45 Finished: FAILURE
Git support per files merge strategy, so we could use 'ours' to just overwrite
latest master :
http://stackoverflow.com/questions/332528/is-it-possible-to-exclude-specific-commits-when-doing-a-git-merge/3970442#3970442
Relevant script would be integration/jenkins , file bin/fetch_gerrit_head.sh
--
Configure bugmail: https://bugzilla.wikimedia.org/userprefs.cgi?tab=email
------- 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
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
