Wed, 18 Nov 2015 15:41:50 -0800 filemerge: add support for change/delete conflicts to the ':other' merge tool
Siddharth Agarwal <sid0@fb.com> [Wed, 18 Nov 2015 15:41:50 -0800] rev 27037
filemerge: add support for change/delete conflicts to the ':other' merge tool This, along with the previous patch to the :local merge tool, covers the full matrix of change/delete conflicts.
Wed, 18 Nov 2015 15:40:28 -0800 filemerge: add support for change/delete conflicts to the ':local' merge tool
Siddharth Agarwal <sid0@fb.com> [Wed, 18 Nov 2015 15:40:28 -0800] rev 27036
filemerge: add support for change/delete conflicts to the ':local' merge tool This covers two of the four cases of change/delete conflicts -- in an upcoming patch we'll make :other cover the other two.
Thu, 19 Nov 2015 10:50:02 -0800 merge.mergestate: compute dirstate action
Siddharth Agarwal <sid0@fb.com> [Thu, 19 Nov 2015 10:50:02 -0800] rev 27035
merge.mergestate: compute dirstate action In upcoming patches we're going to queue these actions up to be applied to the dirstate at the end.
Wed, 18 Nov 2015 14:22:52 -0800 filemerge: return whether the file was deleted
Siddharth Agarwal <sid0@fb.com> [Wed, 18 Nov 2015 14:22:52 -0800] rev 27034
filemerge: return whether the file was deleted This is required for change/delete conflict resolution -- see previous patches for more details.
Wed, 18 Nov 2015 13:55:31 -0800 filemerge: return whether the file is deleted from all other merge tools
Siddharth Agarwal <sid0@fb.com> [Wed, 18 Nov 2015 13:55:31 -0800] rev 27033
filemerge: return whether the file is deleted from all other merge tools This is required for change/delete conflicts -- see the previous patch for more information.
Wed, 18 Nov 2015 13:52:28 -0800 filemerge: return whether the file is deleted for nomerge internal tools
Siddharth Agarwal <sid0@fb.com> [Wed, 18 Nov 2015 13:52:28 -0800] rev 27032
filemerge: return whether the file is deleted for nomerge internal tools We're going to support the filemerge code resolving change/delete conflicts in upcoming patches. Some of these resolutions require that the dirstate be modified. Modifying the dirstate directly from in here would be (a) a pretty bad layering violation and (b) wrong because all dirstate removals should happen before adds. So in this and upcoming patches we're instead going to pass whether the file is deleted up to merge.mergestate, then in there figure out what dirstate action needs to be taken.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 tip