1. Greg Ward
  2. mutable-history

Commits

Pierre-Yves David  committed 218b540

prepare for filtering

  • Participants
  • Parent commits 722b52c
  • Branches default

Comments (0)

Files changed (1)

File hgext/evolve.py

View file
     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