Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
trydiff: use 'not in addedset' for symmetry with 'not in removedset'
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 23 Dec 2014 16:25:00 -0800
changeset 23664 377124ba6b10
parent 23663 a9853fc172d2
child 23665 a90499a6ad8d
trydiff: use 'not in addedset' for symmetry with 'not in removedset' With the previous change in place, we can safely use 'addedset'.
mercurial/patch.py file | annotate | diff | comparison | revisions 
--- a/mercurial/patch.py	Tue Dec 23 16:12:54 2014 -0800
+++ b/mercurial/patch.py	Tue Dec 23 16:25:00 2014 -0800
@@ -1807,7 +1807,7 @@
         tn = None
         dodiff = True
         header = []
-        if f in man1:
+        if f not in addedset:
             to = getfilectx(f, ctx1).data()
         if f not in removedset:
             tn = getfilectx(f, ctx2).data()
Mercurial