Anonymous committed c9ad72b

Document attic.trymerge by explaining how unshelve works.

Comments (0)

Files changed (1)

 def unshelve(ui, repo, name = None, **opts):
-    """applies a patch from the attic to the working copy"""
+    """applies a patch from the attic to the working copy
+    By default, unshelve attempts to do a 3-way merge by committing
+    temporary changesets, merging, then stripping the temporary changesets.
+    This will not work if you have hooks to enforce commit-time policy.  To
+    disable this behavior and simply apply patch files, configure
+    attic.trymerge = false.
+    """
     cwd = os.getcwd()
     s = repo.attic