From: Christian Weisgerber <naddy@mips.inka.de>
Subject: Re: rebase suffers '?' conflicts
To: gameoftrees@openbsd.org
Date: Thu, 13 Apr 2023 22:40:06 +0200

Stefan Sperling:

> Here is a more complete diff which implements the fix for rebase,
> histedit, and merge. With an added safeguard for files which appear
> in added status during the revert step but were not merged into the
> work tree as part of the most recently rebased/edited/merged commit.

This works for my long-suffering test case.
The added safeguard case also works.

> Also adds test coverage.
> 
> OK?

OK as far as I'm concerned, although I don't fully understand the
code.  I found a cosmetic pasto, though:

> +get_paths_added_between_commits(struct got_pathlist_head *added_paths,
...
> +		} else {
> +			if (asprintf(&abspath, "/%s", pe->path) == -1) {
> +				err = got_error_from_errno("strdup");
				                           asprintf
> +				goto done;
> +			}

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de