Comments
Patch
@@ -150,7 +150,7 @@
if opts.get('patch'):
if subrepos:
raise error.Abort(_('--patch cannot be used with --subrepos'))
- if node2 is None:
+ if node2 is None or node1a == node2:
raise error.Abort(_('--patch requires two revisions'))
else:
mod_a, add_a, rem_a = map(set, repo.status(node1a, node2, matcher,
@@ -70,6 +70,12 @@
[1]
#endif
+Specifying an empty revision to --patch should abort.
+
+ $ hg extdiff --patch --rev 'ancestor()' --rev 1
+ abort: --patch requires two revisions
+ [255]
+
Test diff during merge:
$ hg update -C 0