Closed Bug 553877 Opened 10 years ago Closed 10 years ago

Port |Bug 536173, Build fails when building an uncommited merge "ValueError: too many values to unpack| to c-c

Categories

(MailNews Core :: Build Config, defect)

defect
Not set

Tracking

(Not tracked)

VERIFIED FIXED
Thunderbird 3.1b2

People

(Reporter: Callek, Assigned: cork)

References

()

Details

Attachments

(1 file)

+++ This bug was initially created as a clone of Bug #536173 +++

I frequently build merges before committing them to make sure I haven't merged obviously badly. Bug 515792 broke this because `hg parent` returns two parent nodes instead of one and that's unexpected. I think that for now simple quoting will fix this.
Attached patch patch 1Splinter Review
Did a simple search through the code and fixed all MOZ_SOURCE_STAMP i could find.
Attachment #433785 - Flags: review?(ted.mielczarek)
Assignee: bugspam.Callek → Cork
Comment on attachment 433785 [details] [diff] [review]
patch 1

I don't generally do c-c reviews unless requested by a c-c peer.
Attachment #433785 - Flags: review?(ted.mielczarek) → review?(bugspam.Callek)
Attachment #433785 - Flags: review?(bugspam.Callek) → review+
forgot to push for you, thanks again for the patch though...
Keywords: checkin-needed
Pushed as: http://hg.mozilla.org/comm-central/rev/a0eee84feb71
Status: NEW → RESOLVED
Closed: 10 years ago
Keywords: checkin-needed
Resolution: --- → FIXED
V.Fixed, per mxr.
Status: RESOLVED → VERIFIED
Flags: in-testsuite-
OS: Windows 7 → All
Hardware: x86 → All
Target Milestone: --- → Thunderbird 3.1b2
You need to log in before you can comment on or make changes to this bug.