Mercurial > evolve
changeset 631:218b540f5c93
prepare for filtering
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Tue, 04 Dec 2012 00:18:32 +0100 |
parents | 722b52c75f02 |
children | cb0807646f5a |
files | hgext/evolve.py |
diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Mon Dec 17 14:33:01 2012 +0100 +++ b/hgext/evolve.py Tue Dec 04 00:18:32 2012 +0100 @@ -967,6 +967,8 @@ elif 'bumped' in troubles: return _solvebumped(ui, repo, tr, opts['dry_run']) elif 'divergent' in troubles: + repo = repo.unfiltered() + tr = repo[tr.rev()] return _solvedivergent(ui, repo, tr, opts['dry_run']) else: assert False # WHAT? unknown troubles