Mercurial > hg
comparison hgext/largefiles/overrides.py @ 27050:df9b73d2d444
largefiles: fall back to the original for change/delete conflicts
The largefiles merge code (currently) does not handle change/delete conflicts.
So fall back to regular filemerge in that case.
Making this code handle change/delete conflicts is left as an exercise for the
future.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 18 Nov 2015 17:40:13 -0800 |
parents | 86ede9eda252 |
children | 43c00ca887d1 |
comparison
equal
deleted
inserted
replaced
27049:0d61f7ec7f76 | 27050:df9b73d2d444 |
---|---|
542 | 542 |
543 # Override filemerge to prompt the user about how they wish to merge | 543 # Override filemerge to prompt the user about how they wish to merge |
544 # largefiles. This will handle identical edits without prompting the user. | 544 # largefiles. This will handle identical edits without prompting the user. |
545 def overridefilemerge(origfn, premerge, repo, mynode, orig, fcd, fco, fca, | 545 def overridefilemerge(origfn, premerge, repo, mynode, orig, fcd, fco, fca, |
546 labels=None): | 546 labels=None): |
547 if not lfutil.isstandin(orig): | 547 if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent(): |
548 return origfn(premerge, repo, mynode, orig, fcd, fco, fca, | 548 return origfn(premerge, repo, mynode, orig, fcd, fco, fca, |
549 labels=labels) | 549 labels=labels) |
550 | 550 |
551 ahash = fca.data().strip().lower() | 551 ahash = fca.data().strip().lower() |
552 dhash = fcd.data().strip().lower() | 552 dhash = fcd.data().strip().lower() |