Package com.aragost.javahg

Examples of com.aragost.javahg.Changeset

79
80
81
82
83
84
85
86
87
88
89
        CommitCommand commitCmd = CommitCommand.on(repo).message("m").user("user");

        writeFile("a", "boo");
        writeFile("b", "boo");
        AddCommand.on(repo).execute();
        Changeset baseCs = commitCmd.execute();

        writeFile("a", "bar");
        writeFile("b", "bar");
        commitCmd.execute();
View Full Code Here
109
110
111
112
113
114
115
116
117
118
119
120
121
122
    }

    @Test
    public void testMergeCtxAncestor() throws IOException {
        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
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
    @Test
    public void testMergeCtxKeepDeleteConflict() throws IOException {
        Repository repo = getTestRepository();
        writeFile("a", "");
        Changeset base = commit();
        writeFile("a", "a");
        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());
View Full Code Here
169
170
171
172
173
174
175
176
177
178
179
180
181
182
        // Windows does not (in the Mercurial world) support symlinks
        Assume.assumeTrue(!Utils.isWindows());

        Repository repo = getTestRepository();
        writeFile("x", "");
        Changeset base = commit();
        writeFile("a", "");
        setExecutable(repo.file("a"));
        Changeset parent2 = commit();
        update(base);
        createSymlink(repo.file("b"), repo.file("a"));
        commit();

        ConflictResolvingContext mergeCtx = repo.workingCopy().merge(parent2);
View Full Code Here
207
208
209
210
211
212
213
214
215
216
217
218
219
220
        Repository repo = getTestRepository();
        // Merge conflict in a can not be resolved with internal:merge
        // in b the conflict can
        writeFile("a");
        writeFile("b", "a\na\na\na\na\n");
        Changeset base = commit();
        writeFile("a", "XX");
        writeFile("b", "X\na\na\na\na\n");
        Changeset parent2 = commit();
        update(base);
        writeFile("a", "YY");
        writeFile("b", "a\na\na\nY\na\n");
        commit();
View Full Code Here
TOP

Related Classes of com.aragost.javahg.Changeset

  • com.aragost.javahg.commands.AddRemoveCommandTest
  • com.aragost.javahg.commands.AnnotateCommand
  • com.aragost.javahg.commands.AnnotateCommandTest
  • com.aragost.javahg.commands.BackoutCommandTest
  • com.aragost.javahg.commands.BisectCommandTest
  • com.aragost.javahg.commands.BookmarksCommandTest
  • com.aragost.javahg.commands.BranchCommandTest
  • com.aragost.javahg.commands.BranchesTest
  • com.aragost.javahg.commands.CommitCommandTest
  • com.aragost.javahg.commands.GraftCommand
    • 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.