equal
deleted
inserted
replaced
9 from .node import ( |
9 from .node import ( |
10 bin, |
10 bin, |
11 hex, |
11 hex, |
12 nullhex, |
12 nullhex, |
13 nullid, |
13 nullid, |
|
14 nullrev, |
14 ) |
15 ) |
15 from . import ( |
16 from . import ( |
16 error, |
17 error, |
17 filemerge, |
18 filemerge, |
18 pycompat, |
19 pycompat, |
339 fca = self._repo.filectx(afile, fileid=anode, changectx=actx) |
340 fca = self._repo.filectx(afile, fileid=anode, changectx=actx) |
340 # "premerge" x flags |
341 # "premerge" x flags |
341 flo = fco.flags() |
342 flo = fco.flags() |
342 fla = fca.flags() |
343 fla = fca.flags() |
343 if b'x' in flags + flo + fla and b'l' not in flags + flo + fla: |
344 if b'x' in flags + flo + fla and b'l' not in flags + flo + fla: |
344 if fca.node() == nullid and flags != flo: |
345 if fca.rev() == nullrev and flags != flo: |
345 if preresolve: |
346 if preresolve: |
346 self._repo.ui.warn( |
347 self._repo.ui.warn( |
347 _( |
348 _( |
348 b'warning: cannot merge flags for %s ' |
349 b'warning: cannot merge flags for %s ' |
349 b'without common ancestor - keeping local flags\n' |
350 b'without common ancestor - keeping local flags\n' |