Package com.aragost.javahg.merge

Examples of com.aragost.javahg.merge.KeepDeleteConflict.keep()

154
155
156
157
158
159
160
161
162
163
164
        StatusResult status1 = repo.workingCopy().status();
        Assert.assertArrayEquals(new String[] { "a" }, status1.getRemoved().toArray());
        StatusResult status2 = repo.workingCopy().parent2Status();
        Assert.assertTrue(status2.getRemoved().isEmpty());

        keepDeleteConflict.keep();
        Assert.assertTrue(a.exists());
        status1 = repo.workingCopy().status();
        Assert.assertTrue(status1.getRemoved().isEmpty());
        status2 = repo.workingCopy().parent2Status();
        Assert.assertTrue(status2.getRemoved().isEmpty());
View Full Code Here
TOP
Copyright © 2018 www.massapi.com. All rights reserved.
All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.