(t *testing.T)
| 100 | |
| 101 | } |
| 102 | func TestMergeTreesWithoutAncestor(t *testing.T) { |
| 103 | t.Parallel() |
| 104 | repo := createTestRepo(t) |
| 105 | defer cleanupTestRepo(t, repo) |
| 106 | |
| 107 | _, originalTreeId := seedTestRepo(t, repo) |
| 108 | originalTree, err := repo.LookupTree(originalTreeId) |
| 109 | |
| 110 | checkFatal(t, err) |
| 111 | |
| 112 | _, newTreeId := updateReadme(t, repo, "file changed\n") |
| 113 | |
| 114 | newTree, err := repo.LookupTree(newTreeId) |
| 115 | checkFatal(t, err) |
| 116 | index, err := repo.MergeTrees(nil, originalTree, newTree, nil) |
| 117 | if !index.HasConflicts() { |
| 118 | t.Fatal("expected conflicts in the index") |
| 119 | } |
| 120 | _, err = index.Conflict("README") |
| 121 | checkFatal(t, err) |
| 122 | |
| 123 | } |
| 124 | |
| 125 | func appendCommit(t *testing.T, repo *Repository) (*Oid, *Oid) { |
| 126 | loc, err := time.LoadLocation("Europe/Berlin") |
nothing calls this directly
no test coverage detected
searching dependent graphs…