mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
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
This commit is contained in:
parent
8bb0e0f54f
commit
31fe1e97ae
@ -60,6 +60,7 @@ A deleted subrepo file is flagged as dirty, like the top level repo
|
||||
$ 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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user