--- a/hgkw/updatekw.py	Sun Dec 17 14:09:06 2006 +0100
+++ b/hgkw/updatekw.py	Sun Dec 17 14:48:08 2006 +0100
@@ -9,18 +9,18 @@
         # bail out with error
         return True
 
-    p1, p2 = args['parent1'], args['parent2']
-    node1 = repo.changelog.lookup(p1)
-    if p2:
-        node2 = repo.changelog.lookup(p2)
+    n1, n2 = args['parent1'], args['parent2']
+    r1 = repo.changelog.lookup(n1)
+    if n2:
+        r2 = repo.changelog.lookup(n2)
         # next line for debugging only (check merges)
-        ui.warn('parent2: %s\n' % p2)
+        ui.warn('parent2: %s\n' % n2)
     else:
-        node2 = None
+        r2 = None
 
     (modified, added, removed, deleted,
-            unknown, ignored, clean) = repo.status(node1=node1, node2=node2)
+            unknown, ignored, clean) = repo.status(node1=r1, node2=r2)
     candidates = modified + added + clean
 
-    return kwexpander.expandkw(ui, repo,
-            node1, p1, candidates, update=True)
+    if  candidates:
+        return kwexpander.expandkw(ui, repo, r1, n1, candidates, update=True)