# HG changeset patch # User Siddharth Agarwal <sid0@fb.com> # Date 1447897213 28800 # Wed Nov 18 17:40:13 2015 -0800 # Node ID df9b73d2d444ae82fe8d3fe6cf682a93b2c4a7ef # Parent 0d61f7ec7f7637bcfeb6be1e699df5a2e72718fa 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. diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -544,7 +544,7 @@ # largefiles. This will handle identical edits without prompting the user. def overridefilemerge(origfn, premerge, repo, mynode, orig, fcd, fco, fca, labels=None): - if not lfutil.isstandin(orig): + if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent(): return origfn(premerge, repo, mynode, orig, fcd, fco, fca, labels=labels)