Mercurial > evolve
diff tests/test-evolve.t @ 1422:c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Before this patch, evolve --all implied evolve --all --any. With this patch
evolve --all evolves all the aspiring descendants of the parent of the working
copy. evolve --all --any does what evolve --all did before: evolving all the
troubles in the repo.
We add anew function _aspiringdescendant for this purpose
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 22 Jun 2015 21:01:30 -0700 |
| parents | 4198e2fad6ba |
| children | 6db55f28c965 |
line wrap: on
line diff
--- a/tests/test-evolve.t Tue Jun 23 00:02:23 2015 -0700 +++ b/tests/test-evolve.t Mon Jun 22 21:01:30 2015 -0700 @@ -919,6 +919,17 @@ $ hg up 8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' + o 10 [default] a1__ + | + | o 9 [mybranch] a3 + | | + | @ 8 [mybranch] a2 + | | + | x 7 [default] a1_ + |/ + o 0 [default] a0 + $ hg evolve nothing to evolve on current working copy parent (2 other unstable in the repository, do you want --any or --rev) @@ -1156,7 +1167,13 @@ Check that prune respects the allowunstable option $ hg up -C . 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg evolve --rev "22::" + $ hg up 20 + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg evolve --all + nothing to evolve on current working copy parent + (2 other unstable in the repository, do you want --any or --rev) + [2] + $ hg evolve --all --any move:[22] add j2 atop:[26] add j1 move:[23] add j3