Skip to content
Snippets Groups Projects
Commit 23057dc57d1b authored by mpm's avatar mpm
Browse files

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.
parent 8da1df932c16
No related branches found
No related tags found
No related merge requests found
......@@ -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")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment