|
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: | Tue, 30 Aug 2022 15:03:11 +0300 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 |
On 30.08.2022 10:20, Juri Linkov wrote:
I am unfamiliar with Mercurial, but looking at https://www.mercurial-scm.org/wiki/GitConcepts#Git.27s_staging_area where the table says that index/staging area is not necessary in Mercurial and suggests to use shelve instead that corresponds to Git's stash, it would be possible to do the same with Hg as we first tried to do with Git using stash: put changes to stash/shelve, commit and restore the previous state.
I suppose it might work, but then what happens when stashed/shelved changes start to conflict with the ones just committed? The stash can pop up with conflict markers.
Maybe that's okay, I don't know.
[Prev in Thread] | Current Thread | [Next in Thread] |