[PATCH] shelve: unshelve using an unfiltered repository

Pierre-Yves David pierre-yves.david at ens-lyon.org
Fri Nov 8 03:33:58 CST 2013


On 8 nov. 2013, at 07:55, David Soria Parra wrote:

> # HG changeset patch
> # User David Soria Parra <davidsp at fb.com>
> # Date 1383885386 28800
> #      Thu Nov 07 20:36:26 2013 -0800
> # Node ID cf883126f4894744c1ea5cb4795f0003c7f55e56
> # Parent  aa80446aacc3b1574211649cd8f190250b6b04b3
> shelve: unshelve using an unfiltered repository
> 
> when evolve is enabled and a hidden obsolete changeset exists
> in the repository, the strip during unshelve will fail due to
> filtered revs. we use an unfiltered repository like to
> repair.strip to strip the proper nodes.

If strip need an unfiltered repo, why don't you use an unfiltered repo just for strip ?

> 
> diff -r aa80446aacc3 -r cf883126f489 hgext/shelve.py
> --- a/hgext/shelve.py	Wed Nov 06 12:53:39 2013 -0500
> +++ b/hgext/shelve.py	Thu Nov 07 20:36:26 2013 -0800
> @@ -486,6 +486,7 @@
>     """
>     abortf = opts['abort']
>     continuef = opts['continue']
> +    repo = repo.unfiltered()
>     if not abortf and not continuef:
>         cmdutil.checkunfinished(repo)



More information about the Mercurial-devel mailing list