Last modified: 2012-05-09 12:23:50 UTC

Wikimedia Bugzilla is closed!

Wikimedia migrated from Bugzilla to Phabricator. Bug reports are handled in Wikimedia Phabricator.
This static website is read-only and for historical purposes. It is not possible to log in and except for displaying bug reports and their history, links might be broken. See T38686, the corresponding Phabricator task for complete and up-to-date bug report information.
First Last Prev Next    This bug is not in your last search results.
Bug 36686 - Jenkins doesn't reset git "working copy" properly
Jenkins doesn't reset git "working copy" properly
Status: RESOLVED INVALID
Product: Wikimedia
Classification: Unclassified
Continuous integration (Other open bugs)
unspecified
All All
: Unprioritized normal (vote)
: ---
Assigned To: Nobody - You can work on this!
:
Depends on:
Blocks:
  Show dependency tree / graph
 
Reported: 2012-05-09 06:12 UTC by Krinkle
Modified: 2012-05-09 12:23 UTC (History)
2 users (show)

See Also:
Web browser: ---
Mobile Platform: ---
Assignee Huggle Beta Tester: ---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Description Krinkle 2012-05-09 06:12:31 UTC 
Not sure if this is a bug with the Jenkins build script we have or whether the merge conflict is genuine:

See: https://integration.mediawiki.org/ci/job/MediaWiki-GIT-Fetching/1254/console

06:05:01  Auto-merging tests/qunit/suites/resources/mediawiki/mediawiki.test.js
06:05:01  CONFLICT (content): Merge conflict in tests/qunit/suites/resources/mediawiki/mediawiki.test.js
06:05:01  Automatic merge failed; fix conflicts and then commit the result.

Currently used reset routine:
* git remote update
* git reset --hard
* git clean -x -f -d -q
* git checkout master
* git reset --hard remotes/origin/master
* git clean -x -f -d -q
---
* git fetch origin refs/changes/05/6205/3
* git merge FETCH_HEAD
Comment 1 Krinkle 2012-05-09 12:23:50 UTC 
The commit didn't apply cleanly anymore against HEAD. Not a bug :)
Note You need to log in before you can comment on or make changes to this bug.
First Last Prev Next    This bug is not in your last search results.

Navigation
Links