Mercurial > hg

comparison mercurial/hg.py @ 413:a3b5347c22cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove double assignment -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 remove double assignment spotted by Goffredo Baroncelli manifest hash: a0406a618ce5b2b9b10073b29960d594094aa3ed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNXhywK+sNU5EO8RAh9yAJ0aVTnxsumDAdF3JORp1pDebxeE8wCgisdG vf/JwxHbQEqGrefU1nbs928= =NDGW -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 21 Jun 2005 19:07:13 -0800
parents 40cfa2d0c088
children c2b9502a4e96
comparison
equal deleted inserted replaced
412:40cfa2d0c088 413:a3b5347c22cd
1060 if n != m2[f]: 1060 if n != m2[f]:
1061 a = ma.get(f, nullid) 1061 a = ma.get(f, nullid)
1062 # are both different from the ancestor? 1062 # are both different from the ancestor?
1063 if n != a and m2[f] != a: 1063 if n != a and m2[f] != a:
1064 self.ui.debug(" %s versions differ, resolve\n" % f) 1064 self.ui.debug(" %s versions differ, resolve\n" % f)
1065 merge[f] = (m1.get(f, nullid), m2[f])
1066 # merge executable bits 1065 # merge executable bits
1067 # "if we changed or they changed, change in merge" 1066 # "if we changed or they changed, change in merge"
1068 a, b, c = mfa.get(f, 0), mfw[f], mf2[f] 1067 a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
1069 mode = ((a^b) | (a^c)) ^ a 1068 mode = ((a^b) | (a^c)) ^ a
1070 merge[f] = (m1.get(f, nullid), m2[f], mode) 1069 merge[f] = (m1.get(f, nullid), m2[f], mode)