Mercurial > evolve

comparison tests/test-evolve-stop-orphan.t @ 4122:4eb3877540f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 828b423545b1
children e268f7fd7839 18ed2a237ab5
comparison
equal deleted inserted replaced
4120:eea339cf4d30 4122:4eb3877540f1
240 240
241 $ hg evolve --all 241 $ hg evolve --all
242 move:[1] added a 242 move:[1] added a
243 atop:[7] added hgignore 243 atop:[7] added hgignore
244 move:[2] added b 244 move:[2] added b
245 atop:[8] added a
246 move:[5] added c 245 move:[5] added c
247 atop:[9] added b
248 merging c 246 merging c
249 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 247 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
250 fix conflicts and see `hg help evolve.interrupted` 248 fix conflicts and see `hg help evolve.interrupted`
251 [1] 249 [1]
252 250
355 353
356 $ hg evolve --all 354 $ hg evolve --all
357 move:[9] added b 355 move:[9] added b
358 atop:[12] added a 356 atop:[12] added a
359 move:[10] added c 357 move:[10] added c
360 atop:[13] added b
361 merging c 358 merging c
362 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 359 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
363 fix conflicts and see `hg help evolve.interrupted` 360 fix conflicts and see `hg help evolve.interrupted`
364 [1] 361 [1]
365 362