Mercurial > evolve
comparison CHANGELOG @ 4122:4eb3877540f1
evovle: remove redundancy in evolve output
Copying the discription of this redundancy issue given by Pierre Yves David:
When running `hg evolve` to stabilize orphan changeset output about the
currently stabilized changeset is issued. For example:
$ hg evolve
move:[3] a3
atop:[4] a2
working directory is now at 7c5649f73d11
This output can become quite repetitive when orphan are stabilized atop
each other. For example:
$ hg evolve --all
move:[8] dansk 2!
atop:[10] dansk!
merging main-file-1
move:[9] dansk 3!
atop:[11] dansk 2!
In this case it would be smoother to issue:
$ hg evolve --all
move:[8] dansk 2!
atop:[10] dansk!
merging main-file-1
move:[9] dansk 3!
Since we are moving "dansk 3!" atop the changeset we just stabilized.
When adding this be careful that we still want to issue the "atop" message
in various cases:
1. first changesets in a stack
2. when the orphan is not stabilized atop previous one
3. when using hg evolve --continue to resume an evolution
So, I have made the changes which also respect above listed three points.
And changes in tests/test-evovle*.t reflecting the changed behavior.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Fri, 21 Sep 2018 15:52:53 +0530 |
| parents | c6362c4abd69 |
| children | 0c84b48c5e4b |
comparison
equal
deleted
inserted
replaced
| 4120:eea339cf4d30 | 4122:4eb3877540f1 |
|---|---|
| 1 Changelog | 1 Changelog |
| 2 ========= | 2 ========= |
| 3 | |
| 4 8.2.1 - in progress | |
| 5 ------------------- | |
| 6 | |
| 7 * evolve: avoid redundant output when handling linear orphans | |
| 3 | 8 |
| 4 8.2.1 -- 2018-09-14 | 9 8.2.1 -- 2018-09-14 |
| 5 ------------------- | 10 ------------------- |
| 6 | 11 |
| 7 * obshashrange: issue the "long stable cache" update message only once | 12 * obshashrange: issue the "long stable cache" update message only once |