From 160309d573fd0f8217658bf6bec043b01e8601c9 Mon Sep 17 00:00:00 2001
From: Abe Voelker <abe@abevoelker.com>
Date: Wed, 2 Mar 2011 22:17:33 -0600
Subject: [PATCH] Apply Matthias Luescher patch #37 - 'Fix
 MoveProjectFrom/MoveProjectTo interactions'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Július Adam <adam@elcom.sk>
---
 Vss2Git/VssPathMapper.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Vss2Git/VssPathMapper.cs b/Vss2Git/VssPathMapper.cs
index 9dea819..f3e2204 100755
--- a/Vss2Git/VssPathMapper.cs
+++ b/Vss2Git/VssPathMapper.cs
@@ -540,8 +540,12 @@ public VssProjectInfo MoveProjectTo(VssItemName project, VssItemName subproject,
                 if (parentInfo != null)
                 {
                     // propagate the destroyed flag from the new parent
-                    subprojectInfo.Parent = parentInfo;
                     subprojectInfo.Destroyed |= parentInfo.Destroyed;
+                    if (subprojectInfo.Destroyed)
+                    {
+                        // otherwise the parent will be updated in MoveProjectFrom
+                        subprojectInfo.Parent = parentInfo;
+                    }
                 }
                 else
                 {