From: Stefan Sperling <stsp@stsp.name>
Subject: Re: make 'got merge' detect additional problem cases
To: gameoftrees@openbsd.org
Date: Mon, 27 Sep 2021 18:00:01 +0200

On Mon, Sep 27, 2021 at 05:44:22PM +0200, Stefan Sperling wrote:
> (applies on top of my 'got merge -c' output patch I sent earlier today)
> 

Note to reviewers: I've already spotted and remove the bogus line
added in the bottom part of this diff chunk:

> blob - a3608c60299d965c964b1a34f3b87ad35addc9c6
> blob + eafa4a62215e1fb630f5480357bafc155aa31309
> --- regress/cmdline/rebase.sh
> +++ regress/cmdline/rebase.sh
> @@ -1212,10 +1212,14 @@ test_rebase_delete_missing_file() {
>  	echo ": committing to delta on newbranch" >> $testroot/stdout.expected
>  	echo "!  beta" >> $testroot/stdout.expected
>  	echo "!  d/f/g/new" >> $testroot/stdout.expected
> +	echo -n "Files which had incoming changes but could not be found " \
> +		>> $testroot/stdout.expected
> +	echo "in the work tree: 2" >> $testroot/stdout.expected
>  	echo -n "$short_orig_commit2 -> no-op change" \
>  		>> $testroot/stdout.expected
>  	echo ": removing beta and d/f/g/new on newbranch" \
>  		>> $testroot/stdout.expected
> +		>> $testroot/stdout.expected
>  	echo "Switching work tree to refs/heads/newbranch" \
>  		>> $testroot/stdout.expected
>  
> 
>