Closed Bug 1112757 Opened 10 years ago Closed 10 years ago

Update TBPL production to 99e0b27fd3a1

Categories

(Tree Management Graveyard :: TBPL, defect)

Product:
Tree Management Graveyard
Component:
TBPL
Type:
defect
Priority:
Not set
Severity:
normal

Tracking

(Not tracked)

Status:
RESOLVED FIXED

People

(Reporter: emorley, Assigned: emorley)

References

Details

[localhost] out: Changelog: https://hg.mozilla.org/webtools/tbpl/pushloghtml?fromchange=873b8d64246c&tochange=99e0b27fd3a1
[2014-12-17 13:13:57] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg pull -u -v -r 99e0b27fd3a1
[2014-12-17 13:13:59] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg pull -u -v -r 99e0b27fd3a1 (1.771s)
[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 2 changesets with 3 changes to 3 files
[localhost] out: resolving manifests
[localhost] out: getting js/Config.js
[localhost] out: getting js/Data.js
[localhost] out: couldn't find merge tool ecmerge
[localhost] out: couldn't find merge tool editmerge
[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 p4mergeosx
[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: 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
Blocks: 1078266, 1112631
Status: ASSIGNED → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
Product: Tree Management → Tree Management Graveyard
You need to log in before you can comment on or make changes to this bug.