They get created when you revert, they aren't there because of any conflict. They should not be in the patch .. just got caught up in the file list. Here's a webrev that excludes them
http://cr.openjdk.java.net/~prr/8198990.1 -phil. On 03/20/2018 11:45 PM, Krishna Addepalli wrote:
Hi Phil, I see that there are these files in the patch: src/demo/share/jfc/SwingSet2/SwingSet2.java.orig src/demo/share/jfc/SwingSet2/resources/images/About.jpg.orig src/demo/share/jfc/SwingSet2/resources/images/tooltip/cow.gif.orig As per my understanding, these files get created when there are any merge conflicts in the source. Not sure about their purpose here. Thanks, Krishna -----Original Message----- From: Phil Race Sent: Wednesday, March 21, 2018 1:25 AM To: [email protected] Subject: <Swing Dev> RFR: 8198990 : Move SwingSet2 from closed to OpenJDK Bug: https://bugs.openjdk.java.net/browse/JDK-8198990 Webrev: http://cr.openjdk.java.net/~prr/8198990/ SwingSet2 has always been in closed, mostly because of some images that could not be moved to OpenJDK. Due diligence has been done and replacements have been found. This new version has already been reviewed internally. I will be removing the closed version at the same time as pushing this. -phil.
