Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 30161:339f9d93daa6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: only show "cannot merge flags for %s" warning if flags are different
author Mads Kiilerich <madski@unity3d.com>
date Wed, 12 Oct 2016 12:22:18 +0200
parents 98d3d8108db0
children 5cb830801855
comparison
equal deleted inserted replaced
30160:008c4ce64e3f 30161:339f9d93daa6
473 fca = self._repo.filectx(afile, fileid=anode, changeid=actx) 473 fca = self._repo.filectx(afile, fileid=anode, changeid=actx)
474 # "premerge" x flags 474 # "premerge" x flags
475 flo = fco.flags() 475 flo = fco.flags()
476 fla = fca.flags() 476 fla = fca.flags()
477 if 'x' in flags + flo + fla and 'l' not in flags + flo + fla: 477 if 'x' in flags + flo + fla and 'l' not in flags + flo + fla:
478 if fca.node() == nullid: 478 if fca.node() == nullid and flags != flo:
479 if preresolve: 479 if preresolve:
480 self._repo.ui.warn( 480 self._repo.ui.warn(
481 _('warning: cannot merge flags for %s\n') % afile) 481 _('warning: cannot merge flags for %s\n') % afile)
482 elif flags == fla: 482 elif flags == fla:
483 flags = flo 483 flags = flo