# HG changeset patch
# User Saurabh Singh <singhsrb@fb.com>
# Date 2017-10-03 20:05:58
# Node ID 6981d120c9d7f1f264fd72dd53eb22a0e594dbef
# Parent  47b9c572ca325abb6f2aa6c1a210c0461df795a7

test-merge-subrepos: make test compatible with chg

The test checks the output of '.hg/blackbox.log' which will contain
logs corresponding to chg in case chg is running. Therefore, this commit
modifies the test to take chg into consideration while checking the
blackbox.log contents.

Test Plan:
Ran the test 'test-merge-subrepos.t' with and without the '--chg'
option.

Differential Revision: https://phab.mercurial-scm.org/D925

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 @@ A deleted subrepo file is flagged as dir
   $ 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)