Mercurial > evolve
view tests/test-evolve-noupdate.t @ 6931:237f99ee3d64 stable
tests: remove leading spaces in `hg help` output, run only on Mercurial 6.9+
Core decided to remove a lot of leading spaces in docstrings to support Python
3.13, see 51057ab0dffa for details.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 11 Nov 2024 10:39:57 +0400 |
parents | 53d63b608230 |
children | e5bd76f95145 |
line wrap: on
line source
Testing the `--no-update` flag to `hg evolve` command ===================================================== There is an `--update` flag to `hg evolve` command which defaults to False. The `--update` flag updates to the head of the evolved revisions. If you don't want to change your working directory or update your working directory to its successor after hg evolve, `hg evolve --no-update` is the thing for you. This patch tests that flag. Setup ----- $ . $TESTDIR/testlib/common.sh $ cat >> $HGRCPATH <<EOF > [extensions] > evolve = > EOF #testcases inmemory ondisk #if inmemory $ cat >> $HGRCPATH <<EOF > [experimental] > evolution.in-memory = yes > EOF #endif $ hg init stoprepo $ cd stoprepo $ echo ".*\.orig" > .hgignore $ hg add .hgignore $ hg ci -m "added hgignore" $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done; $ hg glog @ 4:c41c793e0ef1 added d | () draft o 3:ca1b80f7960a added c | () draft o 2:b1661037fa25 added b | () draft o 1:c7586e2a9264 added a | () draft o 0:8fa14d15e168 added hgignore () draft Making sure we stay where we were if current wdir parent was not obsoleted -------------------------------------------------------------------------- $ hg up .^^ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ echo bar > b $ hg amend 2 new orphan changesets $ hg glog @ 5:7ed0642d644b added b | () draft | * 4:c41c793e0ef1 added d | | () draft orphan | * 3:ca1b80f7960a added c | | () draft orphan | x 2:b1661037fa25 added b |/ () draft o 1:c7586e2a9264 added a | () draft o 0:8fa14d15e168 added hgignore () draft There is no 'working directory is now at' message because we didn't update $ hg evolve --all --no-update move:[3] added c atop:[5] added b move:[4] added d $ hg glog o 7:b6b20b8eefdc added d | () draft o 6:7c46f743e62f added c | () draft @ 5:7ed0642d644b added b | () draft o 1:c7586e2a9264 added a | () draft o 0:8fa14d15e168 added hgignore () draft Updating to successor when working directory parent is obsoleted by evolution ----------------------------------------------------------------------------- $ hg prev 0 files updated, 0 files merged, 1 files removed, 0 files unresolved [1] added a $ echo bar > a $ hg amend 3 new orphan changesets $ hg up 7ed0642d644b 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg glog o 8:3d41537b44ca added a | () draft | * 7:b6b20b8eefdc added d | | () draft orphan | * 6:7c46f743e62f added c | | () draft orphan | @ 5:7ed0642d644b added b | | () draft orphan | x 1:c7586e2a9264 added a |/ () draft o 0:8fa14d15e168 added hgignore () draft $ hg evolve --all --any --no-update move:[5] added b atop:[8] added a move:[6] added c move:[7] added d working directory is now at 4a58b1d0c4f3 $ hg glog o 11:43480a2dfd57 added d | () draft o 10:ed864d50e6e4 added c | () draft @ 9:4a58b1d0c4f3 added b | () draft o 8:3d41537b44ca added a | () draft o 0:8fa14d15e168 added hgignore () draft