# HG changeset patch
# User mpm@selenic.com
# Date 1117176888 28800
# Node ID 23057dc57d1b01b06897e8d89bd6fe81b12c849c
# Parent  8da1df932c16d3cfa29f0f13c89c8adebca659cf
hg merge: abort if there are outstanding changes in the working directory

We currently don't support merging from the tip into the working
directory, so merge with outstanding local changes is asking for
trouble.



diff -r 8da1df932c16 -r 23057dc57d1b hg
--- a/hg	Thu May 26 22:47:43 2005 -0800
+++ b/hg	Thu May 26 22:54:48 2005 -0800
@@ -406,6 +406,11 @@
     print "}"
 
 elif cmd == "merge":
+    (c, a, d) = repo.diffdir(repo.root, repo.current)
+    if c:
+        ui.warn("aborting (outstanding changes in working directory)\n")
+        sys.exit(1)
+
     if args:
         other = hg.repository(ui, args[0])
         ui.status("requesting changegroup\n")