Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 22966:ff93aa006e6a
manifest: transpose pair of pairs from diff()
It makes more sense for the file nodeids and returned from diff() to
be ((n1,fl1),(n2,fl2)) than ((n1,n2),(fl1,fl2)), so change it to the
former.
| author | Martin von Zweigbergk <martinvonz@gmail.com> |
|---|---|
| date | Tue, 14 Oct 2014 23:18:07 -0700 |
| parents | b697fa74b475 |
| children | 3177d710630d 902554884335 |
line wrap: on
line diff
--- a/mercurial/merge.py Tue Oct 14 22:48:44 2014 -0700 +++ b/mercurial/merge.py Tue Oct 14 23:18:07 2014 -0700 @@ -424,7 +424,7 @@ # Compare manifests diff = m1.diff(m2) - for f, ((n1, n2), (fl1, fl2)) in diff.iteritems(): + for f, ((n1, fl1), (n2, fl2)) in diff.iteritems(): if partial and not partial(f): continue if n1 and n2: