This commit is contained in:
Andy Arthur
2020-04-12 18:18:42 -07:00
parent f7db5450ac
commit 86b87baeb7
3 changed files with 1 additions and 4 deletions
+1 -2
View File
@@ -276,7 +276,6 @@ func TagRebaseForCommits(ctx context.Context, ddb *doltdb.DoltDB, tm TagMapping,
func replayCommitWithNewTag(ctx context.Context, root, parentRoot, rebasedParentRoot *doltdb.RootValue, tm TagMapping) (*doltdb.RootValue, error) {
tableNames, err := doltdb.UnionTableNames(ctx, root, rebasedParentRoot)
if err != nil {
@@ -852,4 +851,4 @@ func rootsMustBeEqual(r1, r2 *doltdb.RootValue) bool {
panic(err)
}
return h1.Equal(h2)
}
}
-1
View File
@@ -65,4 +65,3 @@ func (us *Uint64Set) AsSlice() []uint64 {
func (us *Uint64Set) Size() int {
return len(us.uints)
}
-1
View File
@@ -33,7 +33,6 @@ func TestNewUint64Set(t *testing.T) {
}
assert.False(t, us.Contains(19))
// test .ContainsAll()
assert.True(t, us.ContainsAll([]uint64{0, 1}))
assert.False(t, us.ContainsAll([]uint64{0, 1, 2, 19}))