Closed Bug 849194 Opened 11 years ago Closed 11 years ago

Update TBPL production to ff675a032597

Categories

(Tree Management Graveyard :: TBPL, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: emorley, Assigned: emorley)

References

Details

[localhost] out: comparing with http://hg.mozilla.org/webtools/tbpl
[localhost] out: searching for changes
[localhost] out: 1f4ac367a1e2 | Bug 847964 - Rename &noignore=1 to &showall=1 and map the legacy format to the new; r=RyanVM
[localhost] out: 22ce65694062 | Bug 844103 - Add missing php5-curl dependency to Vagrant's puppet manifest; r=rhelmer
[localhost] out: e27b160b36c6 | Bug 793159 - Add more logging to log pre-fetching and annotated summary generation; r=RyanVM
[localhost] out: 05d457d4e7f8 | Bug 848008 - Add support for robocop split into two chunks; r=RyanVM
[localhost] out: ff675a032597 | Bug 848444 - Rename "Win opt/debug" to "Win7 opt/debug"; r=armenzg
[2013-03-08 04:09:48] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg pull -r ff675a032597 -u -v
[2013-03-08 04:09:50] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg pull -r ff675a032597 -u -v (1.331s)
[localhost] out: pulling from http://hg.mozilla.org/webtools/tbpl
[localhost] out: searching for changes
[localhost] out: all local heads known remotely
[localhost] out: adding changesets
[localhost] out: adding manifests
[localhost] out: adding file changes
[localhost] out: added 5 changesets with 13 changes to 10 files
[localhost] out: resolving manifests
[localhost] out: couldn't find merge tool ecmerge
[localhost] out: couldn't find merge tool filemerge
[localhost] out: couldn't find merge tool gpyfm
[localhost] out: couldn't find merge tool kdiff3
[localhost] out: couldn't find merge tool meld
[localhost] out: couldn't find merge tool bcompare
[localhost] out: couldn't find merge tool UltraCompare
[localhost] out: couldn't find merge tool araxis
[localhost] out: couldn't find merge tool beyondcompare3
[localhost] out: couldn't find merge tool diffuse
[localhost] out: couldn't find merge tool diffmerge
[localhost] out: couldn't find merge tool p4merge
[localhost] out: couldn't find merge tool tkdiff
[localhost] out: couldn't find merge tool tortoisemerge
[localhost] out: couldn't find merge tool xxdiff
[localhost] out: couldn't find merge tool gvimdiff
[localhost] out: merging dataimport/import-buildbot-data.py
[localhost] out: getting js/BuildbotDBUser.js
[localhost] out: getting js/Config.js
[localhost] out: getting js/Controller.js
[localhost] out: getting js/Data.js
[localhost] out: getting php/getLogExcerpt.php
[localhost] out: getting php/getRevisionBuilds.php
[localhost] out: getting php/inc/AnnotatedSummaryGenerator.php
[localhost] out: getting php/inc/ParallelLogGenerating.php
[localhost] out: getting puppet/manifests/classes/tbpl-base.pp
[localhost] out: 9 files updated, 1 files merged, 0 files removed, 0 files unresolved

No idea why dataimport/import-buildbot-data.py needed merging...?!
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
Product: Webtools → Tree Management
Product: Tree Management → Tree Management Graveyard
You need to log in before you can comment on or make changes to this bug.