[PATCH V5] rebase: fail-fast the pull if working dir is not clean (BC)

Sean Farley sean at farley.io
Sun Jan 8 05:13:00 UTC 2017


Valters Vingolds <valters at vingolds.ch> writes:

> # HG changeset patch
> # User Valters Vingolds <valters at vingolds.ch>
> # Date 1483272989 -3600
> #      Sun Jan 01 13:16:29 2017 +0100
> # Node ID 73c1068ae4b9ba4de6c7a20ff10754b6f3b9bb85
> # Parent  011122b3b1c42374fb0489d107418e1be3665ca6
> rebase: fail-fast the pull if working dir is not clean (BC)
>
> 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.
> In tests, we create a 'histedit' session to verify that also an unfinished
> state is detected and handled.

If I've followed the discussion so far, this patch seems to address all
of Pierre-Yves' comments, so I think it's good to go. Marking as
pre-reviewed.



More information about the Mercurial-devel mailing list