Mercurial > evolve
view tests/test-topic-multiple.t @ 6791:2ef4e26c4bc0 stable
topic: add more branchcache entries to test-topic-flow-publish-flag.t
It seems these new entries started appearing after the recent-ish refactoring
of branchcache in core. Now the server and the client have the same branch
cache data on disk, which is probably for the best.
The actual output with changeset hashes is:
branch2-base:c0155e8ec55a9b46d415d5b13a319d0c80e26e9d o double//slash
branch2-immutable:c0155e8ec55a9b46d415d5b13a319d0c80e26e9d o double//slash
branch2-served:256a2cb64fd8ada4ff18d57606d212f094cb50fb o double//slash
c0155e8ec55a is public, so it's correct to be in "base" and "immutable" repo
views. 256a2cb64fd8 is draft (without topic), so it's expected to be in the
"served" view.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 13 Jun 2024 15:45:02 +0400 |
parents | f394b41fcbc7 |
children | 9da0114a8a02 |
line wrap: on
line source
Testing topics on cases when we have multiple topics based on top of other. $ . "$TESTDIR/testlib/topic_setup.sh" Setup $ cat << EOF >> $HGRCPATH > [experimental] > evolution = all > [ui] > interactive = True > logtemplate = {rev} - \{{get(namespaces, "topics")}} {node|short} {desc} ({phase})\n > [extensions] > show = > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH Test to make sure `hg evolve` don't solve troubles out of current stack: ------------------------------------------------------------------------ $ hg init repo1 $ cd repo1 $ for ch in a b c; do > echo $ch > $ch > hg ci -Am "added "$ch --topic foo > done; adding a active topic 'foo' grew its first changeset (see 'hg help topics' for more information) adding b adding c $ echo d > d $ hg ci -Am "added d" --topic bar adding d active topic 'bar' grew its first changeset (see 'hg help topics' for more information) $ hg up -r "desc('added c')" > echo cc >> c switching to topic foo 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg amend 1 new orphan changesets $ hg log -G @ 4 - {foo} 0cc68cbf943a added c (draft) | | * 3 - {bar} 94b12ff0f44a added d (draft) | | | x 2 - {foo} 9c315cf1e7de added c (draft) |/ o 1 - {foo} ead01932caf0 added b (draft) | o 0 - {foo} 853c9ec0849e added a (draft) $ hg stack ### topic: foo ### target: default (branch) s3@ added c (current) s2: added b s1: added a As expected, evolve should deny to evolve here as there is no troubled csets in current stack: $ hg evolve --all nothing to evolve on current working copy parent (1 other orphan in the repository, do you want --any or --rev) [2]