# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1183670221 18000
# Node ID f48290864625d7de522ad990230e1d7cc437c20a
# Parent  616a5adbf40262d90bab8036ab639588d8aecd0e# Parent  8706e75e6431dea156074c5f86e175b2795f25b2
Merge with stable

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -478,6 +478,9 @@ def recordupdates(repo, action, branchme
                     repo.dirstate.forget([f])
         elif m == "d": # directory rename
             f2, fd, flag = a[2:]
+            if not f2 and f not in repo.dirstate:
+                # untracked file moved
+                continue
             if branchmerge:
                 repo.dirstate.update([fd], 'a')
                 if f:
diff --git a/tests/test-issue612 b/tests/test-issue612
new file mode 100755
--- /dev/null
+++ b/tests/test-issue612
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+mkdir t
+cd t
+
+hg init
+mkdir src
+echo a > src/a.c
+hg ci -Ama -d "10000000 0"
+
+hg mv src source
+hg ci -Ammove -d "1000000 0"
+
+hg co -C 0
+echo new > src/a.c
+echo compiled > src/a.o
+hg ci -mupdate -d "1000000 0"
+
+hg st
+
+hg merge
+
+hg st
+
diff --git a/tests/test-issue612.out b/tests/test-issue612.out
new file mode 100644
--- /dev/null
+++ b/tests/test-issue612.out
@@ -0,0 +1,11 @@
+adding src/a.c
+copying src/a.c to source/a.c
+removing src/a.c
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+? src/a.o
+merging src/a.c and source/a.c
+1 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+M source/a.c
+R src/a.c
+? source/a.o