Package org.eclipse.jgit.api

Examples of org.eclipse.jgit.api.Git.checkout()

348
349
350
351
352
353
354
355
356
357
358
    writeTrashFile("d/1", "modified");
    RevCommit masterCommit = git.commit().setAll(true)
        .setMessage("modified d/1 on master").call();

    git.checkout().setCreateBranch(true).setStartPoint(first)
        .setName("side").call();
    writeTrashFile("d/1", "modified");
    RevCommit sideCommit = git.commit().setAll(true)
        .setMessage("modified d/1 on side").call();
View Full Code Here
384
385
386
387
388
389
390
391
392
393
394
    writeTrashFile("d/1", "orig");
    git.add().addFilepattern("d/1").call();
    RevCommit masterCommit = git.commit().setAll(true)
        .setMessage("added d/1 on master").call();

    git.checkout().setCreateBranch(true).setStartPoint(first)
        .setName("side").call();
    writeTrashFile("d/1", "orig");
    git.add().addFilepattern("d/1").call();
    git.commit().setAll(true).setMessage("added d/1 on side").call();
View Full Code Here
421
422
423
424
425
426
427
428
429
430
431
    writeTrashFile("d/1", "master");
    git.add().addFilepattern("d/1").call();
    RevCommit masterCommit = git.commit().setAll(true)
        .setMessage("added d/1 on master").call();

    git.checkout().setCreateBranch(true).setStartPoint(first)
        .setName("side").call();
    writeTrashFile("d/1", "side");
    git.add().addFilepattern("d/1").call();
    git.commit().setAll(true).setMessage("added d/1 on side").call();
View Full Code Here
457
458
459
460
461
462
463
464
465
466
467
    writeTrashFile("0", "master");
    RevCommit masterCommit = git.commit().setAll(true)
        .setMessage("modified 0 on master").call();

    git.checkout().setCreateBranch(true).setStartPoint(first)
        .setName("side").call();
    writeTrashFile("0", "side");
    git.commit().setAll(true).setMessage("modified 0 on side").call();

    git.rm().addFilepattern("0").call();
View Full Code Here
491
492
493
494
495
496
497
498
499
500
501
    writeTrashFile("1", "1master\n2\n3");
    RevCommit masterCommit = git.commit().setAll(true)
        .setMessage("modified 1 on master").call();

    git.checkout().setCreateBranch(true).setStartPoint(first)
        .setName("side").call();
    writeTrashFile("1", "1\n2\n3side");
    git.commit().setAll(true).setMessage("modified 1 on side").call();

    git.rm().addFilepattern("0").call();
View Full Code Here
531
532
533
534
535
536
537
538
539
540
541
    writeTrashFile("1", "1master2\n2\n3");
    git.commit().setAll(true)
        .setMessage("modified 1 on master again").call();

    git.checkout().setCreateBranch(true).setStartPoint(first)
        .setName("side").call();
    writeTrashFile("1", "1\n2\na\nb\nc\n3side");
    RevCommit sideCommit = git.commit().setAll(true)
        .setMessage("modified 1 on side").call();
View Full Code Here
545
546
547
548
549
550
551
552
553
554
555
    MergeResult result = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.MERGED, result.getMergeStatus());
    result.getNewHead();
    git.checkout().setName("master").call();
    result = git.merge().setStrategy(strategy).include(sideCommit).call();
    assertEquals(MergeStatus.MERGED, result.getMergeStatus());

    // we have two branches which are criss-cross merged. Try to merge the
    // tips. This should succeed with RecursiveMerge and fail with
View Full Code Here
82
83
84
85
86
87
88
89
90
91
92
    defaultDb = createWorkRepository();
    Git git = new Git(defaultDb);
    JGitTestUtil.writeTrashFile(defaultDb, "hello.txt", "branch world");
    git.add().addFilepattern("hello.txt").call();
    oldCommitId = git.commit().setMessage("Initial commit").call().getId();
    git.checkout().setName(BRANCH).setCreateBranch(true).call();
    git.checkout().setName("master").call();
    git.tag().setName(TAG).call();
    JGitTestUtil.writeTrashFile(defaultDb, "hello.txt", "master world");
    git.add().addFilepattern("hello.txt").call();
    git.commit().setMessage("Second commit").call();
View Full Code Here
83
84
85
86
87
88
89
90
91
92
93
    Git git = new Git(defaultDb);
    JGitTestUtil.writeTrashFile(defaultDb, "hello.txt", "branch world");
    git.add().addFilepattern("hello.txt").call();
    oldCommitId = git.commit().setMessage("Initial commit").call().getId();
    git.checkout().setName(BRANCH).setCreateBranch(true).call();
    git.checkout().setName("master").call();
    git.tag().setName(TAG).call();
    JGitTestUtil.writeTrashFile(defaultDb, "hello.txt", "master world");
    git.add().addFilepattern("hello.txt").call();
    git.commit().setMessage("Second commit").call();
View Full Code Here
96
97
98
99
100
101
102
103
104
105
106
    git.rm().addFilepattern("folder1/file1.txt")
        .addFilepattern("folder1/file2.txt").call();
    RevCommit other = git.commit()
        .setMessage("removing folders on 'other'").call();

    git.checkout().setName(base.name()).call();

    file = new File(db.getWorkTree(), "unrelated.txt");
    write(file, "unrelated");

    git.add().addFilepattern("unrelated.txt").call();
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.