emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: master 4803fba487 1/2: 'C-x v v' on a diff buffer commits it as a pa


From: Dmitry Gutov
Subject: Re: master 4803fba487 1/2: 'C-x v v' on a diff buffer commits it as a patch (bug#52349)
Date: Mon, 17 Oct 2022 03:11:18 +0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2

On 01.09.2022 14:48, Dmitry Gutov wrote:
On 01.09.2022 14:45, Lars Ingebrigtsen wrote:
Dmitry Gutov<dgutov@yandex.ru>  writes:

The step of "applying the saved patch" relies on our Lisp code being
correct and being able to handle any diff. It's not an outrageous
assumption, but an assumption nevertheless.
Oh, I was assuming that we were assuming that we had "patch" installed
for this to work.  I don't think that's unreasonable for new
functionality like this.

I suggested this upthread but didn't get any affirmative response.

This would be easier, yes.

So... I ended up using 'patch', but not for backing up existing uncommitted changes.

It's the same reason as why 'hg shelve' and 'git stash' are a poor fit: when we try to apply the patch at the end, we can get a conflict (and not every such conflict will be easy enough to fix by hand).

The file-copying approach matches Git's implementation well, and hopefully will work with various backends, including CVS. I only tested with Hg for now.

Feedback welcome.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]