Merge pull request swiftlang#272 from apple/revert-271-xfail-nonempty

shahmishal · web-flow · commit 209a396cbe3e · 2018-10-29T12:48:25.000-07:00
Revert "Also xfail NonEmpty on swift-4.2-branch"
diff --git a/projects.json b/projects.json
@@ -1359,8 +1359,7 @@
           "compatibility": {
             "4.1": {
               "branch": {
-                "master": "https://bugs.swift.org/browse/SR-9068",
-                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-9111"
+                "master": "https://bugs.swift.org/browse/SR-9068"
               }
             }
           }
@@ -1376,8 +1375,7 @@
           "compatibility": {
             "4.1": {
               "branch": {
-                "master": "https://bugs.swift.org/browse/SR-9068",
-                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-9111"
+                "master": "https://bugs.swift.org/browse/SR-9068"
               }
             }
           }
@@ -1393,8 +1391,7 @@
           "compatibility": {
             "4.1": {
               "branch": {
-                "master": "https://bugs.swift.org/browse/SR-9068",
-                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-9111"
+                "master": "https://bugs.swift.org/browse/SR-9068"
               }
             }
           }
@@ -1410,8 +1407,7 @@
           "compatibility": {
             "4.1": {
               "branch": {
-                "master": "https://bugs.swift.org/browse/SR-9068",
-                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-9111"
+                "master": "https://bugs.swift.org/browse/SR-9068"
               }
             }
           }
@@ -1424,8 +1420,7 @@
           "compatibility": {
             "4.1": {
               "branch": {
-                "master": "https://bugs.swift.org/browse/SR-9068",
-                "swift-4.2-branch": "https://bugs.swift.org/browse/SR-9111"
+                "master": "https://bugs.swift.org/browse/SR-9068"
               }
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -1359,8 +1359,7 @@`
`1359`	`1359`	`"compatibility": {`
`1360`	`1360`	`"4.1": {`
`1361`	`1361`	`"branch": {`
`1362`		`- "master": "https://bugs.swift.org/browse/SR-9068",`
`1363`		`- "swift-4.2-branch": "https://bugs.swift.org/browse/SR-9111"`
	`1362`	`+ "master": "https://bugs.swift.org/browse/SR-9068"`
`1364`	`1363`	`}`
`1365`	`1364`	`}`
`1366`	`1365`	`}`
`@@ -1376,8 +1375,7 @@`
`1376`	`1375`	`"compatibility": {`
`1377`	`1376`	`"4.1": {`
`1378`	`1377`	`"branch": {`
`1379`		`- "master": "https://bugs.swift.org/browse/SR-9068",`
`1380`		`- "swift-4.2-branch": "https://bugs.swift.org/browse/SR-9111"`
	`1378`	`+ "master": "https://bugs.swift.org/browse/SR-9068"`
`1381`	`1379`	`}`
`1382`	`1380`	`}`
`1383`	`1381`	`}`
`@@ -1393,8 +1391,7 @@`
`1393`	`1391`	`"compatibility": {`
`1394`	`1392`	`"4.1": {`
`1395`	`1393`	`"branch": {`
`1396`		`- "master": "https://bugs.swift.org/browse/SR-9068",`
`1397`		`- "swift-4.2-branch": "https://bugs.swift.org/browse/SR-9111"`
	`1394`	`+ "master": "https://bugs.swift.org/browse/SR-9068"`
`1398`	`1395`	`}`
`1399`	`1396`	`}`
`1400`	`1397`	`}`
`@@ -1410,8 +1407,7 @@`
`1410`	`1407`	`"compatibility": {`
`1411`	`1408`	`"4.1": {`
`1412`	`1409`	`"branch": {`
`1413`		`- "master": "https://bugs.swift.org/browse/SR-9068",`
`1414`		`- "swift-4.2-branch": "https://bugs.swift.org/browse/SR-9111"`
	`1410`	`+ "master": "https://bugs.swift.org/browse/SR-9068"`
`1415`	`1411`	`}`
`1416`	`1412`	`}`
`1417`	`1413`	`}`
`@@ -1424,8 +1420,7 @@`
`1424`	`1420`	`"compatibility": {`
`1425`	`1421`	`"4.1": {`
`1426`	`1422`	`"branch": {`
`1427`		`- "master": "https://bugs.swift.org/browse/SR-9068",`
`1428`		`- "swift-4.2-branch": "https://bugs.swift.org/browse/SR-9111"`
	`1423`	`+ "master": "https://bugs.swift.org/browse/SR-9068"`
`1429`	`1424`	`}`
`1430`	`1425`	`}`
`1431`	`1426`	`}`