removing todo and fixing test

This commit is contained in:
James Cor
2022-04-13 13:52:47 -07:00
parent f1ebf7e42c
commit 7a3c80f7a9
2 changed files with 1 additions and 5 deletions
+1 -4
View File
@@ -264,16 +264,13 @@ func CloneRemote(ctx context.Context, srcDB *doltdb.DoltDB, remoteName, branch s
return err
}
// Retrieve existing working set
// Retrieve existing working set, delete if it exists
ws, err := dEnv.DoltDB.ResolveWorkingSet(ctx, wsRef)
if ws != nil {
dEnv.DoltDB.DeleteWorkingSet(ctx, wsRef)
}
ws = doltdb.EmptyWorkingSet(wsRef)
// TODO: this might be where the actual working set is
//dEnv.DoltDB.ResolveWorkingSet()
// Update to use current Working and Staged root
err = dEnv.UpdateWorkingSet(ctx, ws.WithWorkingRoot(rootVal).WithStagedRoot(rootVal))
if err != nil {
-1
View File
@@ -397,7 +397,6 @@ teardown() {
@test "replication: local clone" {
run dolt clone file://./repo1/.dolt/noms repo2
[ "$status" -eq 0 ]
[[ "$output" =~ "chunks complete. 0 chunks being downloaded currently." ]] || false
cd repo2
run dolt ls
[ "$status" -eq 0 ]