Patchwork D925: test-merge-subrepos: make test compatible with chg

login
register
mail settings
Submitter phabricator
Date Oct. 4, 2017, 12:08 a.m.
Message ID <93edc4b8e4e32b0a4f38252147a42987@localhost.localdomain>
Download mbox | patch
Permalink /patch/24454/
State Not Applicable
Headers show

Comments

phabricator - Oct. 4, 2017, 12:08 a.m.
quark updated this revision to Diff 2394.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D925?vs=2385&id=2394

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

AFFECTED FILES
  tests/test-merge-subrepos.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-merge-subrepos.t b/tests/test-merge-subrepos.t
--- a/tests/test-merge-subrepos.t
+++ b/tests/test-merge-subrepos.t
@@ -60,6 +60,7 @@ 
   $ hg id --config extensions.blackbox= --config blackbox.dirty=True
   9bfe45a197d7+ tip
   $ cat .hg/blackbox.log
+  * @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> serve --cmdserver chgunix * (glob) (chg !)
   * @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> id (glob)
   * @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> id --config *extensions.blackbox=* --config *blackbox.dirty=True* exited 0 * (glob)