Mercurial > evolve
comparison hgext/evolve.py @ 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 |
comparison
equal
deleted
inserted
replaced
| 630:722b52c75f02 | 631:218b540f5c93 |
|---|---|
| 965 if 'unstable' in troubles: | 965 if 'unstable' in troubles: |
| 966 return _solveunstable(ui, repo, tr, opts['dry_run']) | 966 return _solveunstable(ui, repo, tr, opts['dry_run']) |
| 967 elif 'bumped' in troubles: | 967 elif 'bumped' in troubles: |
| 968 return _solvebumped(ui, repo, tr, opts['dry_run']) | 968 return _solvebumped(ui, repo, tr, opts['dry_run']) |
| 969 elif 'divergent' in troubles: | 969 elif 'divergent' in troubles: |
| 970 repo = repo.unfiltered() | |
| 971 tr = repo[tr.rev()] | |
| 970 return _solvedivergent(ui, repo, tr, opts['dry_run']) | 972 return _solvedivergent(ui, repo, tr, opts['dry_run']) |
| 971 else: | 973 else: |
| 972 assert False # WHAT? unknown troubles | 974 assert False # WHAT? unknown troubles |
| 973 | 975 |
| 974 def _picknexttroubled(ui, repo, pickany=False): | 976 def _picknexttroubled(ui, repo, pickany=False): |