Bug 7078 – auto-merge broke trunk strings.txt

Bug 7078 - auto-merge broke trunk strings.txt

Summary:

auto-merge broke trunk strings.txt

Status:	CLOSED FIXED

Product:	Logitech Media Server
Classification:	Unclassified
Component:	Misc
Version:	7.0
Platform:	PC All

Importance:	P2 blocker (vote)
Target Milestone:	7.x
Assigned To:	Michael Herger

URL:
Keywords:

Depends on:
Blocks:
	Show dependency tree / graph

Reported:	2008-02-11 10:08 UTC by Mark Miksis
Modified:	2009-07-31 10:16 UTC (History)
CC List:	0 users

See Also:
Category:	---

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

Note You need to log in before you can comment on or make changes to this bug.

Description Mark Miksis 2008-02-11 10:08:22 UTC

Reported on the forums:

[08-02-10 15:53:48.5999] Slim::Utils::Strings::string (363) Error:
missing string WORDCLOCKOUTPUT_DISABLED

It seems that:
Sean updated the strings in trunk only at change 17060.
Michael made some strings updates to 7.0 in change 17117 which were auto-merged to trunk at change 17120.
The merge stepped on the changes from change 17060.

Comment 1 Michael Herger 2008-02-11 11:03:56 UTC

change 17409 - please test. Thanks!

Comment 2 James Richardson 2008-05-08 13:50:52 UTC

(In reply to comment #1)
> change 17409 - please test. Thanks!
> 

Appears to be fixed in 7.0.1 - 19325.  Please reopen the bug if you see any other errors

Comment 3 James Richardson 2008-05-15 12:27:52 UTC

This bug has recently been fixed in the latest release of SqueezeCenter 7.0.1

Please try that version, if you still see the error, then reopen this bug.

To download this version, please navigate to: http://www.slimdevices.com/su_downloads.html

Comment 4 Chris Owens 2009-07-31 10:16:59 UTC

Reduce number of active targets for SC