Patch 1939: WIP re-write externalResolution

Title	WIP re-write externalResolution
Superseder		Nosy List	bfrk
Related Issues
Status	in-discussion	Assigned To
Milestone

Created on 2019-09-25.09:45:03 by bfrk, last changed 2020-01-25.09:16:24 by ganesh.

Files
File name	Status	Uploaded	Type	Edit	Remove
patch-preview.txt		bfrk, 2019-09-25.09:45:02	text/x-darcs-patch
unnamed		bfrk, 2019-09-25.09:45:02	text/plain
wip-re_write-externalresolution.dpatch		bfrk, 2019-09-25.09:45:02	application/x-darcs-patch

See mailing list archives for discussion on individual patches.

msg21584 (view)

Author: bfrk

Date: 2019-09-25.09:45:02

As discussed in patch1913 I am sending a refactor of the externalResolution
procedure. It is supposed to keep behavior of the existing code intact (with
the minor exception of using displayPath when we tell the user what we are
doing).

However, when I tried --external-merge on a complex conflicted pull I
noticed that the filepath filtering is completely broken with or without
this patch! The path lists calculated by effectOnPaths cannot be matched up
in this simple manner. For instance the patch I pulled adds a new file which
messes up the path lists so that the external tool now gets completely
unrelated files as input.

The next thing to do here is to write a test that checks that file paths are
correctly matched in the presence of file add, remove, and move patches,
then fix the file path filtering.

1 patch for repository http://darcs.net/screened:

patch ac2b69b232f6413b4ca66b05748ebb723f7a9d1d
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Sep 25 01:28:42 CEST 2019
  * WIP re-write externalResolution

Attachments

History
Date	User	Action	Args
2019-09-25 09:45:03	bfrk	create
2020-01-25 09:16:24	ganesh	set	status: needs-screening -> in-discussion

Patch 1939 WIP re-write externalResolution

Attachments