[PATCH] rebase: fail-fast pull if working dir is not clean

Valters Vingolds valters at vingolds.ch
Wed Jan 4 11:06:27 EST 2017


Hi, sure - I will look into this.

On Wed, Jan 4, 2017 at 4:53 PM, Pierre-Yves David <
pierre-yves.david at ens-lyon.org> wrote:

>
>
> On 01/02/2017 10:18 AM, Valters Vingolds wrote:
>
>> # HG changeset patch
>> # User Valters Vingolds <valters at vingolds.ch>
>> # Date 1483272989 -3600
>> #      Sun Jan 01 13:16:29 2017 +0100
>> # Branch stable
>> # Node ID 390134fdec5612ec59f33c02ca45e969839b3a1b
>> # Parent  7817df5585db1d87d3f6c7f496085c86d87e2e9a
>> rebase: fail-fast pull if working dir is not clean
>>
>> Refuse to run 'hg pull --rebase' if there are uncommitted changes:
>> so that instead of going ahead with fetching changes and then suddenly
>> aborting
>> the rebase, we can warn user of uncommitted changes (or unclean repo
>> state)
>> right up front.
>>
>
> If I get that change right, this means that if the working copy is dirty
> (or operation are in progress) we no longer perform the "pull" phase of the
> "pull+rebase" operation.
>
> I think this make sense but this a behavior change so it needs a "(BC)"
> flag at the end of the description summary. In addition, we will want this
> tested. Can you update one of the rebase testcase to check this case? (see
> "tests/test-rebase*.t")
>
> Thanks,
>
>

-- 
Valters Vingolds
http://www.linkedin.com/in/valters
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20170104/47221406/attachment.html>


More information about the Mercurial-devel mailing list