Apply Matthias Luescher patch trevorr#37 - 'Fix MoveProjectFrom/MoveP…

…rojectTo interactions' Signed-off-by: Július Adam <[email protected]>
JAD-SVK · Jul 4, 2016 · 160309d · 160309d
1 parent 73782c4
commit 160309d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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
                 {