# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1363642640 18000
# Node ID 8a7bd2dccd44ed571afe7424cd7f95594f27c092
# Parent  930d54b1fd2905170ad75c2b0dbbdc04528f0f15
applyupdates: assign variable before we try to use it (issue3855)

The variable 'fd' was getting used with a value left over from a prior
iteration, causing a KeyError: '.hgsubstate'.

diff -r 930d54b1fd29 -r 8a7bd2dccd44 mercurial/merge.py
--- a/mercurial/merge.py	Tue Apr 02 16:03:10 2013 +0200
+++ b/mercurial/merge.py	Mon Mar 18 16:37:20 2013 -0500
@@ -382,11 +382,11 @@
                              (f, inst.strerror))
             removed += 1
         elif m == "m": # merge
+            f2, fd, move = a[2:]
             if fd == '.hgsubstate': # subrepo states need updating
                 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
                                  overwrite)
                 continue
-            f2, fd, move = a[2:]
             audit(fd)
             r = ms.resolve(fd, wctx, mctx)
             if r is not None and r > 0: