From: Thomas Adam <thomas@xteddy.org>
Subject: Re: preserve binary files during updates and merges
To: gameoftrees@openbsd.org
Date: Sat, 20 Nov 2021 22:12:55 +0000

On Sat, Nov 20, 2021 at 11:03:44PM +0100, Stefan Sperling wrote:
> On Mon, Nov 15, 2021 at 02:56:04PM +0100, Stefan Sperling wrote:
> > I have added test cases for 'got update' and 'got cherrypick'.
> > This should be enough to other relevant commands since they all share
> > the same file merge code.
> > 
> > The tests are using /bin/ls, /bin/cat, and /bin/cp as binary file test data.
> > Is this a bad idea? This approach works on OpenBSD but I am not sure if
> > it will work on every -portable platform because some Linux distributions
> > tend to put things in odd places. Other suggestions?
> > But I think that fixing this later, once this patch has been committed, will
> > be easier than trying to find a perfect solution before an initial commit.
> 
> This patch is now on the main branch.
> 
> Is there anything we should do to make the newly added tests easier
> to digest for -portable releases?

I'll let you know once I've ported the changes over.  But on a quick glance, I
suspect we'll be OK...

Kindly,
Thomas