Mercurial > evolve
changeset 5379:35e7c6f6d6dc
tests: adjust spelling and spacing
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 11 Jun 2020 23:38:55 +0800 |
| parents | f18d2509e4f2 |
| children | 60317988f5ae |
| files | tests/test-topic-push.t |
| diffstat | 1 files changed, 14 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-push.t Thu Jun 11 23:36:58 2020 +0800 +++ b/tests/test-topic-push.t Thu Jun 11 23:38:55 2020 +0800 @@ -26,14 +26,14 @@ $ hg init draft $ cat << EOF >> draft/.hg/hgrc > [phases] - > publish=False + > publish = no > EOF $ hg clone main client updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat << EOF >> client/.hg/hgrc > [paths] - > draft=../draft + > draft = ../draft > EOF @@ -108,7 +108,7 @@ searching for changes @ 3 mountain draft CC - $ hg push + $ hg push pushing to $TESTTMP/main (glob) searching for changes abort: push creates new remote branches: mountain! @@ -287,7 +287,7 @@ $ cat << EOF >> ../draft/.hg/hgrc > [extensions] - > topic=! + > topic = ! > EOF $ hg push ssh://user@dummy/draft pushing to ssh://user@dummy/draft @@ -349,8 +349,8 @@ o 0 default public CA -Check that we reject multiple head on the same topic ----------------------------------------------------- +Check that we reject multiple heads on the same topic +----------------------------------------------------- $ hg up 'desc(CB)' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -380,9 +380,8 @@ (merge or see 'hg help push' for details about pushing new heads) [255] -Multiple head on a branch merged in a topic changesets ------------------------------------------------------------------------- - +Multiple heads on a branch merged into a topic branch +----------------------------------------------------- $ hg up 'desc(CA)' 0 files updated, 0 files merged, 2 files removed, 0 files unresolved @@ -425,7 +424,6 @@ (merge or see 'hg help push' for details about pushing new heads) [255] - Reject when pushing to publishing $ hg push -r . @@ -439,9 +437,9 @@ $ cd .. Test phase move -================================== +=============== -setup, two repo knowns about two small topic branch +setup, two repos have two small topic branches $ hg init repoA $ hg clone repoA repoB @@ -449,11 +447,11 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat << EOF >> repoA/.hg/hgrc > [phases] - > publish=False + > publish = no > EOF $ cat << EOF >> repoB/.hg/hgrc > [phases] - > publish=False + > publish = no > EOF $ cd repoA $ echo aaa > base @@ -491,12 +489,12 @@ o 0 default draft CBASE -We turn different topic to public on each side, +We turn a different topic to public on each side, $ hg -R repoA phase --public topicA $ hg -R repoB phase --public topicB -Pushing should complain because it create to heads on default +Pushing should complain because it would create two heads on default $ hg push -R repoA repoB pushing to repoB