Mercurial > hg4j
diff test/org/tmatesoft/hg/test/RepoUtils.java @ 707:42b88709e41d
Merge: support 'unresolved' resolution with MergeStateBuilder
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Fri, 16 Aug 2013 19:22:59 +0200 |
parents | 4fd317a2fecf |
children |
line wrap: on
line diff
--- a/test/org/tmatesoft/hg/test/RepoUtils.java Fri Aug 16 14:54:09 2013 +0200 +++ b/test/org/tmatesoft/hg/test/RepoUtils.java Fri Aug 16 19:22:59 2013 +0200 @@ -28,7 +28,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.LinkedList; -import java.util.List; import junit.framework.Assert; @@ -175,21 +174,7 @@ } static void rmdir(File dest) throws IOException { - LinkedList<File> queue = new LinkedList<File>(); - queue.addAll(Arrays.asList(dest.listFiles())); - while (!queue.isEmpty()) { - File next = queue.removeFirst(); - if (next.isDirectory()) { - List<File> files = Arrays.asList(next.listFiles()); - if (!files.isEmpty()) { - queue.addAll(files); - queue.add(next); - } - // fall through - } - next.delete(); - } - dest.delete(); + FileUtils.rmdir(dest); } static Nodeid[] allRevisions(HgRepository repo) {