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 @@ -59,9 +59,18 @@ $ hg id --config extensions.blackbox= --config blackbox.dirty=True 9bfe45a197d7+ tip +#if no-chg $ cat .hg/blackbox.log * @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> id (glob) * @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> id --config *extensions.blackbox=* --config *blackbox.dirty=True* exited 0 * (glob) +#else +The first line of blackbox.log will correspond to the chg master server. +Therefore, glob first line when chg is running. + $ cat .hg/blackbox.log + * (glob) + * @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> id (glob) + * @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> id --config *extensions.blackbox=* --config *blackbox.dirty=True* exited 0 * (glob) +#endif TODO: a deleted file should be listed as such, like the top level repo