Bug 99755

Summary:	Avoid merge conflicts with TestExpectations
Product:	WebKit	Reporter:	Hin-Chung Lam <hclam>
Component:	Tools / Tests	Assignee:	Nobody <webkit-unassigned>
Status:	NEW ---
Severity:	Normal	CC:	abarth, dpranke, eric, maruel, tony
Priority:	P2	Keywords:	NRWT
Version:	528+ (Nightly build)
Hardware:	Unspecified
OS:	Unspecified

Description Hin-Chung Lam 2012-10-18 13:56:42 PDT

Appending new test expectations to the end of file often results in merge conflicts.

For example patches in this bug: https://bugs.webkit.org/show_bug.cgi?id=94240. Almost everytime I uploaded I had to merge manually even the expectations are appended.

Comment 1 Dirk Pranke 2012-10-18 13:58:36 PDT

As I discussed over IM w/ hclam, we currently treat TestExpectations like any other text file, and so some merges work but some don't.

However, I don't really know much about how patch works; perhaps there are some flags we could add (or a special merge driver we could write) that would make merging easier or more robust.

Anyone have any ideas?