Fix __checkout_files() in gitmergeonefile.py

[stgit] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 3b2fc75..ad9105b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-11  Catalin Marinas  <catalin.marinas@gmail.com>
 
+       * gitmergeonefile.py: Fix the os.rename exception occurring when
+       the checkout directory is not present
+
        * stgit/main.py (export): Add --template option to use a different
        file as the export template rather than the default one
        (delete): Check for local changes only of the current patch is