When should a user prefer one of `hg amend` or `hg commit --amend`?
Long Vu
long.vu at intelerad.com
Thu Oct 29 19:31:49 UTC 2015
On Fri, Oct 23, 2015 at 5:03 PM, Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
>
> On 10/23/2015 10:01 PM, Long Vu wrote:
>>
>> On Fri, Oct 23, 2015 at 4:35 PM, Pierre-Yves David
>> <pierre-yves.david at ens-lyon.org> wrote:
>>>
>>>
>>>
>>> On 10/23/2015 08:47 PM, Long Vu wrote:
>>>>
>>>>
>>>> So both add the uncommitted changes in the workdir into the new commit
>>>> and obsolete the original one.
>>>>
>>>> `hg amend` create a "temporary amend commit" while `hg commit --amend`
>>>> do
>>>> not.
>>>
>>>
>>>
>>> They both behave the same way in this regard, they actually use the very
>>> same code-path.
>>
>>
>> `hg commit --amend` just silently discard the temporary amend commit
>> while `hg amend` keeps it?
>
>
> There should be no difference there. Do you see any difference?
>
Sorry for late answer. I haven't been able to work on the bug that
uses evolve since then.
I do not see any difference in the "diff". Should I see any
difference somewhere else, like in the meta data?
Side question, are we allowed to `hg amend` on a rev that is already
obsoleted (tried to `hg amend` on a rev that I already `hg ci --amend`
on)? I am getting mercurial.error.FilteredIndexError.
--
Long Vu | Build Controller | Intelerad | +1-514-931-6222 ext. 7743
--
This email or any attachments may contain confidential or legally
privileged information intended for the sole use of the addressees. Any
use, redistribution, disclosure, or reproduction of this information,
except as intended, is prohibited. If you received this email in error,
please notify the sender and remove all copies of the message, including
any attachments.
More information about the Evolve-testers
mailing list