Package com.aragost.javahg.merge

Examples of com.aragost.javahg.merge.ConflictResolvingContext

47
48
49
50
51
52
53
54
55
56
57
        writeFile("a");
        Changeset cs = commit();
        update(base);
        writeFile("b");
        commit();
        ConflictResolvingContext r = GraftCommand.on(repo).execute(cs);
        Assert.assertNull(r);
        Changeset tip = repo.tip();
        String source = tip.getExtra().getString("source");
        Assert.assertEquals(cs.getNode(), source);
    }
View Full Code Here
113
114
115
116
117
118
119
120
121
122
        Repository repo = getTestRepository();
        Changeset base = createChangeset();
        Changeset parent2 = createChangeset();
        update(base);
        Changeset parent1 = createChangeset();
        ConflictResolvingContext ms = repo.workingCopy().merge(parent2);
        Assert.assertEquals(parent1, ms.getLocal());
        Assert.assertEquals(parent2, ms.getRemote());
        Assert.assertEquals(base, ms.getBase());
    }
View Full Code Here
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
        Changeset p2 = commit();
        update(base);
        repo.workingCopy().remove("a");
        Changeset p1 = commit();

        ConflictResolvingContext ms = repo.workingCopy().merge(p2);
        Assert.assertEquals(1, ms.getKeepDeleteConflicts().size());
        KeepDeleteConflict keepDeleteConflict = ms.getKeepDeleteConflicts().iterator().next();
        Assert.assertEquals(KeepDeleteConflict.State.KEEP, keepDeleteConflict.getState());
        Assert.assertEquals("a", keepDeleteConflict.getFilename());
        Assert.assertEquals(p2, keepDeleteConflict.getKeepParent());

        update(p2);
        ms = repo.workingCopy().merge(p1);
        Assert.assertEquals(1, ms.getKeepDeleteConflicts().size());
        keepDeleteConflict = ms.getKeepDeleteConflicts().iterator().next();
        Assert.assertEquals(KeepDeleteConflict.State.KEEP, keepDeleteConflict.getState());
        Assert.assertEquals("a", keepDeleteConflict.getFilename());
        Assert.assertEquals(p2, keepDeleteConflict.getKeepParent());

        File a = getTestRepository().file("a");
View Full Code Here
177
178
179
180
181
182
183
184
185
186
187
        Changeset parent2 = commit();
        update(base);
        createSymlink(repo.file("b"), repo.file("a"));
        commit();

        ConflictResolvingContext mergeCtx = repo.workingCopy().merge(parent2);
        //Assert.assertEquals(1, mergeCtx.getFlagConflicts().size());
        //Assert.assertEquals("a", mergeCtx.getFlagConflicts().iterator().next().getFilename());
        Assert.assertEquals(1, mergeCtx.getMergeConflicts().size());
        Assert.assertEquals("a", mergeCtx.getMergeConflicts().iterator().next().getFilename());
    }
View Full Code Here
216
217
218
219
220
221
222
223
224
225
226
227
        update(base);
        writeFile("a", "YY");
        writeFile("b", "a\na\na\nY\na\n");
        commit();

        ConflictResolvingContext mergeState = repo.workingCopy().merge(parent2);
        List<MergeConflict> mergeConflicts = mergeState.getMergeConflicts();
        Assert.assertEquals(2, mergeConflicts.size());
        MergeConflict mca = mergeConflicts.get(0);
        MergeConflict mcb = mergeConflicts.get(1);
        Assert.assertEquals("a", mca.getFilename());
        Assert.assertEquals("b", mcb.getFilename());
View Full Code Here
TOP

Related Classes of com.aragost.javahg.merge.ConflictResolvingContext

  • com.aragost.javahg.commands.GraftCommandTest
  • com.aragost.javahg.commands.MergeCommandTest
  • com.aragost.javahg.internals.UnexpectedCommandOutputException
    • Copyright © 2018 www.massapicom. 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.