equal
deleted
inserted
replaced
10 |
10 |
11 import collections |
11 import collections |
12 import os |
12 import os |
13 |
13 |
14 from .i18n import _ |
14 from .i18n import _ |
15 from .node import ( |
15 from .node import nullrev |
16 nullid, |
|
17 nullrev, |
|
18 ) |
|
19 |
16 |
20 from . import ( |
17 from . import ( |
21 match as matchmod, |
18 match as matchmod, |
22 pathutil, |
19 pathutil, |
23 policy, |
20 policy, |
577 return False |
574 return False |
578 fctx = ctx[path] |
575 fctx = ctx[path] |
579 parents = fctx._filelog.parents(fctx._filenode) |
576 parents = fctx._filelog.parents(fctx._filenode) |
580 nb_parents = 0 |
577 nb_parents = 0 |
581 for n in parents: |
578 for n in parents: |
582 if n != nullid: |
579 if n != repo.nullid: |
583 nb_parents += 1 |
580 nb_parents += 1 |
584 return nb_parents >= 2 |
581 return nb_parents >= 2 |
585 |
582 |
586 return ismerged |
583 return ismerged |
587 |
584 |