Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 18505:9de9727cea53 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix UnboundLocalError (issue3791) A wrong variable name was introduced in 384df4db6520 for a case without test coverage. The variable name is fixed and a test case is introduced.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 30 Jan 2013 19:29:36 +0100
parents 8a811fa9a9c0
children cf25e4efd685 8a7bd2dccd44
comparison
equal deleted inserted replaced
18504:d1d5fdcc2d46 18505:9de9727cea53
249 else: 249 else:
250 act("remote is newer", "g", f, fl2) 250 act("remote is newer", "g", f, fl2)
251 elif nol and n2 == a: # remote only changed 'x' 251 elif nol and n2 == a: # remote only changed 'x'
252 act("update permissions", "e", f, fl2) 252 act("update permissions", "e", f, fl2)
253 elif nol and n == a: # local only changed 'x' 253 elif nol and n == a: # local only changed 'x'
254 act("remote is newer", "g", f, fl) 254 act("remote is newer", "g", f, fl1)
255 else: # both changed something 255 else: # both changed something
256 act("versions differ", "m", f, f, f, False) 256 act("versions differ", "m", f, f, f, False)
257 elif f in copied: # files we'll deal with on m2 side 257 elif f in copied: # files we'll deal with on m2 side
258 pass 258 pass
259 elif f in movewithdir: # directory rename 259 elif f in movewithdir: # directory rename