Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 30162:5cb830801855

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: clarify warning for (not) merging flags without ancestor Give hints why it can't merge and what it will do instead.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 12 Oct 2016 12:22:18 +0200
parents 339f9d93daa6
children 90a6c18a7c1d
comparison
equal deleted inserted replaced
30161:339f9d93daa6 30162:5cb830801855
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 and flags != flo: 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 '
482 'without common ancestor - keeping local flags\n')
483 % afile)
482 elif flags == fla: 484 elif flags == fla:
483 flags = flo 485 flags = flo
484 if preresolve: 486 if preresolve:
485 # restore local 487 # restore local
486 if hash != nullhex: 488 if hash != nullhex: