Patchwork D8106: tests: accept new bzr message about switching branches

login
register
mail settings
Submitter phabricator
Date Feb. 10, 2020, 11:53 p.m.
Message ID <differential-rev-PHID-DREV-r2klqm5g7pcoppxidb2x-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45111/
State Superseded
Headers show

Comments

phabricator - Feb. 10, 2020, 11:53 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The new version apparently prints "Switched to branch at " instead of
  "Switched to branch: ".

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8106

AFFECTED FILES
  tests/test-convert-bzr.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel
phabricator - Feb. 11, 2020, 5:33 a.m.
martinvonz added inline comments.

INLINE COMMENTS

> test-convert-bzr.t:229
>    Tree is up to date at revision 1.
> -  Switched to branch: *repo/branch/ (glob)
> +  Switched to branch *repo/branch/ (glob)
>    $ sleep 1

The added space before `*` here broke tests. I fixed up the queued commit myself.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8106/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8106

To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-convert-bzr.t b/tests/test-convert-bzr.t
--- a/tests/test-convert-bzr.t
+++ b/tests/test-convert-bzr.t
@@ -226,7 +226,7 @@ 
   Created tag trunk-tag.
   $ bzr switch -b branch
   Tree is up to date at revision 1.
-  Switched to branch: *repo/branch/ (glob)
+  Switched to branch *repo/branch/ (glob)
   $ sleep 1
   $ echo b > b
   $ bzr add -q b
@@ -235,7 +235,7 @@ 
   Created tag branch-tag.
   $ bzr switch --force ../repo/trunk
   Updated to revision 1.
-  Switched to branch: */repo/trunk/ (glob)
+  Switched to branch */repo/trunk/ (glob)
   $ sleep 1
   $ echo a >> a
   $ bzr ci -qm changea