Mercurial > evolve
comparison tests/test-evolve-order.t @ 1412:8794a4680bdd
evolve: warn about every skipped evolution
When we could not evolve a revision, we used to silently ignore it. We now
inform the user that we ignored something and tell him why (with more or less
informative message).
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 19 Jun 2015 17:35:29 -0700 |
parents | b3afdc0815d0 |
children | b86eea66ed02 |
comparison
equal
deleted
inserted
replaced
1411:64515965c0df | 1412:8794a4680bdd |
---|---|
256 $ hg amend -m 'b3second' | 256 $ hg amend -m 'b3second' |
257 1 new unstable changesets | 257 1 new unstable changesets |
258 $ hg evolve --rev 'unstable()' | 258 $ hg evolve --rev 'unstable()' |
259 move:[30] add b4_ | 259 move:[30] add b4_ |
260 atop:[35] b3second | 260 atop:[35] b3second |
261 skipping 08a530ce67e1: divergent rewriting. can't choose destination | |
261 working directory is now at a51a8a82fdba | 262 working directory is now at a51a8a82fdba |
262 | 263 |