From a19aef402ea9a3f447d7b4b55246f6b8b82577c0 Mon Sep 17 00:00:00 2001 From: Tony Duckles Date: Sat, 18 Feb 2012 16:44:50 -0600 Subject: [PATCH] Ensure target WC is clean/reverted when continuing. --- svn2svn/run/svn2svn.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/svn2svn/run/svn2svn.py b/svn2svn/run/svn2svn.py index da77332..b3000ab 100644 --- a/svn2svn/run/svn2svn.py +++ b/svn2svn/run/svn2svn.py @@ -729,6 +729,11 @@ def real_main(args, parser): ui.status("Checking-out _wc_target...", level=ui.VERBOSE) svnclient.svn_checkout(target_url, wc_target) os.chdir(wc_target) + if wc_exists: + # If using an existing WC, make sure it's clean ("svn revert") + ui.status("Cleaning-up _wc_target...", level=ui.VERBOSE) + run_svn(["cleanup"]) + full_svn_revert() if not options.cont_from_break: # TODO: Warn user if trying to start (non-continue) into a non-empty target path? -- 2.43.0