Package org.eclipse.jgit.junit.TestRepository

Examples of org.eclipse.jgit.junit.TestRepository.BranchBuilder.commit()

372
373
374
375
376
377
378
379
380
381
382
    BranchBuilder side = db_t.branch("side");
    RevCommit s1 = side.commit().parent(m0)
        .add("f", "1\nx(side)\n2\n3\ny(side)\n")
        .message("s1").create();
    RevCommit s2 = side.commit().parent(m1)
        .add("f", "1\nx(side)\n2\n3\ny(side-again)\n")
        .message("s2(merge)")
        .create();
    RevCommit m2 = master.commit().parent(s1)
        .add("f", "1\nx(side)\n2\n3\ny(side)\n").message("m2(merge)")
View Full Code Here
446
447
448
449
450
451
452
453
454
455
456
      throws Exception {
    if (!validateStates(indexState, worktreeState))
      return;

    BranchBuilder master = db_t.branch("master");
    RevCommit m0 = master.commit().add("f", "1\n2\n3\n").add("m.m", "0")
        .add("m.d", "0").add("s.m", "0").add("s.d", "0").message("m0")
        .create();
    RevCommit m1 = master.commit().add("f", "1-master\n2\n3\n")
        .add("m.c", "0").add("m.m", "1").rm("m.d").message("m1")
        .create();
View Full Code Here
449
450
451
452
453
454
455
456
457
458
459
    BranchBuilder master = db_t.branch("master");
    RevCommit m0 = master.commit().add("f", "1\n2\n3\n").add("m.m", "0")
        .add("m.d", "0").add("s.m", "0").add("s.d", "0").message("m0")
        .create();
    RevCommit m1 = master.commit().add("f", "1-master\n2\n3\n")
        .add("m.c", "0").add("m.m", "1").rm("m.d").message("m1")
        .create();
    db_t.getRevWalk().parseCommit(m1);

    BranchBuilder side = db_t.branch("side");
View Full Code Here
455
456
457
458
459
460
461
462
463
464
465
        .add("m.c", "0").add("m.m", "1").rm("m.d").message("m1")
        .create();
    db_t.getRevWalk().parseCommit(m1);

    BranchBuilder side = db_t.branch("side");
    RevCommit s1 = side.commit().parent(m0).add("f", "1\n2\n3-side\n")
        .add("s.c", "0").add("s.m", "1").rm("s.d").message("s1")
        .create();
    RevCommit s2 = side.commit().parent(m1)
        .add("f", "1-master\n2\n3-side-r\n").add("m.m", "1")
        .add("m.c", "0").rm("m.d").message("s2(merge)").create();
View Full Code Here
458
459
460
461
462
463
464
465
466
467
468
    BranchBuilder side = db_t.branch("side");
    RevCommit s1 = side.commit().parent(m0).add("f", "1\n2\n3-side\n")
        .add("s.c", "0").add("s.m", "1").rm("s.d").message("s1")
        .create();
    RevCommit s2 = side.commit().parent(m1)
        .add("f", "1-master\n2\n3-side-r\n").add("m.m", "1")
        .add("m.c", "0").rm("m.d").message("s2(merge)").create();
    RevCommit m2 = master.commit().parent(s1)
        .add("f", "1-master-r\n2\n3-side\n").add("s.m", "1")
        .add("s.c", "0").rm("s.d").message("m2(merge)").create();
View Full Code Here
537
538
539
540
541
542
543
544
545
546
547
      throws Exception {
    if (!validateStates(indexState, worktreeState))
      return;

    BranchBuilder master = db_t.branch("master");
    RevCommit m0 = master.commit().add("f", "1\n2\n3\n4\n5\n6\n7\n8\n9\n")
        .message("m0").create();
    RevCommit m1 = master.commit()
        .add("f", "1-master\n2\n3\n4\n5\n6\n7\n8\n9\n").message("m1")
        .create();
    db_t.getRevWalk().parseCommit(m1);
View Full Code Here
539
540
541
542
543
544
545
546
547
548
549
      return;

    BranchBuilder master = db_t.branch("master");
    RevCommit m0 = master.commit().add("f", "1\n2\n3\n4\n5\n6\n7\n8\n9\n")
        .message("m0").create();
    RevCommit m1 = master.commit()
        .add("f", "1-master\n2\n3\n4\n5\n6\n7\n8\n9\n").message("m1")
        .create();
    db_t.getRevWalk().parseCommit(m1);

    BranchBuilder side = db_t.branch("side");
View Full Code Here
545
546
547
548
549
550
551
552
553
554
555
        .add("f", "1-master\n2\n3\n4\n5\n6\n7\n8\n9\n").message("m1")
        .create();
    db_t.getRevWalk().parseCommit(m1);

    BranchBuilder side = db_t.branch("side");
    RevCommit s1 = side.commit().parent(m0)
        .add("f", "1\n2\n3\n4\n5\n6\n7\n8\n9-side\n").message("s1")
        .create();
    RevCommit s2 = side.commit().parent(m1)
        .add("f", "1-master\n2\n3\n4\n5\n6\n7-res(side)\n8\n9-side\n")
        .message("s2(merge)").create();
View Full Code Here
548
549
550
551
552
553
554
555
556
557
558
    BranchBuilder side = db_t.branch("side");
    RevCommit s1 = side.commit().parent(m0)
        .add("f", "1\n2\n3\n4\n5\n6\n7\n8\n9-side\n").message("s1")
        .create();
    RevCommit s2 = side.commit().parent(m1)
        .add("f", "1-master\n2\n3\n4\n5\n6\n7-res(side)\n8\n9-side\n")
        .message("s2(merge)").create();
    RevCommit m2 = master.commit().parent(s1)
        .add("f", "1-master\n2\n3\n4\n5\n6\n7-conflict\n8\n9-side\n")
        .message("m2(merge)").create();
View Full Code Here
609
610
611
612
613
614
615
616
617
618
619
      throws Exception {
    if (!validateStates(indexState, worktreeState))
      return;

    BranchBuilder master = db_t.branch("master");
    RevCommit m0 = master.commit().add("f", "1\n2\n3\n4\n5\n6\n7\n8\n9\n")
        .message("m0").create();
    RevCommit m1 = master.commit()
        .add("f", "1-master\n2\n3\n4\n5\n6\n7\n8\n9\n").message("m1")
        .create();
    BranchBuilder side = db_t.branch("side");
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.