588399 - Windows l10n repacks die on bad working copies, untracked files

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Axel Hecht [:Pike]]

I've see a few l10n repacks die on ...

pulling from http://hg.mozilla.org/releases/mozilla-1.9.2
searching for changes
no changes found
abort: untracked file in working directory differs from file in requested revision: 'content/base/public/Makefile.in'
abort: untracked file in working directory differs from file in requested revision: 'content/base/public/Makefile.in'

I bet changing the hg update to hg update -C should fix that. Also, using an objdir would likely help.

Comment 1

[Armen [:armenzg]]

This has just landed http://hg.mozilla.org/build/buildbotcustom/rev/91f1cc47614b
Let me mark things to clobber.

Comment 2

[Armen [:armenzg]]

Marking fixed as I have marked the builders to clobber.
Please reopen if this happens again and/or requires further intervention.
Putting back into the pool just in case it gets reopened.

Comment 3

[Axel Hecht [:Pike]]

Reopening,

abort: untracked file in working directory differs from file in requested revision: 'build/pgo/profileserver.py.in'
abort: untracked file in working directory differs from file in requested revision: 'build/pgo/profileserver.py.in'

in http://tinderbox.mozilla.org/showlog.cgi?log=Mozilla-l10n/1282166324.1282166744.10163.gz&fulltext=1

I don't see it doing an update -C, fwiw.

Comment 4

[Aki Sasaki (not active)]

Attachment: update -C

Missed some hg updates that are part of the clone step.
Added the -C flag.

Comment 5

[Axel Hecht [:Pike]]

Comment on attachment 467534 [details] [diff] [review]
update -C

Thanks, looking good, didn't find more.

Comment 6

[Aki Sasaki (not active)]

This bug also mentions issues tracked in bug 587854 (buildbotcustom: When updating sources, discard uncommitted changes) and bug 482447 (use a mozconfig and objdir for l10n repack builds)

Comment 7

[Aki Sasaki (not active)]

Comment on attachment 467534 [details] [diff] [review]
update -C

http://hg.mozilla.org/build/buildbotcustom/rev/812af5608b6e

Comment 8

[Aki Sasaki (not active)]

Marking fixed; the bugs listed in comment 6 are still open to track those two issues.