enable selective pull in mononoke test

Summary: enable selective pull in mononoke test

Reviewed By: muirdm

Differential Revision: D63999703

fbshipit-source-id: a4debd3b55ac85e0a07cdd5ab33c889d403efd73

eden/mononoke/tests/integration/commitsync/complex.toml

@@ -21,7 +21,7 @@
 
 [megarepo_test]
 large_repo_id = 0
-common_pushrebase_bookmarks = ["main_bookmark"]
+common_pushrebase_bookmarks = ["master_bookmark"]
 version_name = "COMPLEX_1"
 
  [[megarepo_test.small_repos]]

eden/mononoke/tests/integration/cross_repo/test-cross-repo-commit-sync-git-like.t

@@ -15,7 +15,7 @@
  > "large": {
  > "versions": [
  > {
- > "common_pushrebase_bookmarks": ["main"],
+ > "common_pushrebase_bookmarks": ["master_bookmark"],
  > "large_repo_id": 0,
  > "small_repos": [
  > {
@@ -29,12 +29,12 @@
  > }
  > ],
  > "common": {
- > "common_pushrebase_bookmarks": ["main"],
+ > "common_pushrebase_bookmarks": ["master_bookmark"],
  > "large_repo_id": 0,
  > "small_repos": {
  > 1: {
  > "bookmark_prefix": "small_repo_prefix/",
- > "common_pushrebase_bookmarks_map": { "main": "heads/main" }
+ > "common_pushrebase_bookmarks_map": { "master_bookmark": "heads/master_bookmark" }
  > }
  > }
  > }
@@ -47,7 +47,7 @@
  > LA-LB-LC
  > \ 
  > LD
- > # bookmark: LA main
+ > # bookmark: LA master_bookmark
  > # bookmark: LA common_bookmark
  > EOF
  LA=b32ac5e4bcae0f9e8a25327e30674cf4f81ade62b6fb6fdf4e561f5099ec396a
@@ -59,7 +59,7 @@
  > SA-SB-SC
  > \ 
  > SD-SE
- > # bookmark: SA heads/main
+ > # bookmark: SA heads/master_bookmark
  > # bookmark: SA heads/common_bookmark
  > # bookmark: SA heads/other_bookmark
  > EOF
@@ -73,7 +73,7 @@
  $ add_synced_commit_mapping_entry 1 $SA 0 $LA test_version
  $ mononoke_newadmin bookmarks --repo-name large list
  b32ac5e4bcae0f9e8a25327e30674cf4f81ade62b6fb6fdf4e561f5099ec396a common_bookmark
- b32ac5e4bcae0f9e8a25327e30674cf4f81ade62b6fb6fdf4e561f5099ec396a main
+ b32ac5e4bcae0f9e8a25327e30674cf4f81ade62b6fb6fdf4e561f5099ec396a master_bookmark
 
 -- start mononoke
  $ start_and_wait_for_mononoke_server
@@ -97,7 +97,7 @@
 
  $ mononoke_newadmin bookmarks --repo-name large list
  b32ac5e4bcae0f9e8a25327e30674cf4f81ade62b6fb6fdf4e561f5099ec396a common_bookmark
- b32ac5e4bcae0f9e8a25327e30674cf4f81ade62b6fb6fdf4e561f5099ec396a main
+ b32ac5e4bcae0f9e8a25327e30674cf4f81ade62b6fb6fdf4e561f5099ec396a master_bookmark
  b32ac5e4bcae0f9e8a25327e30674cf4f81ade62b6fb6fdf4e561f5099ec396a small_repo_prefix/heads/common_bookmark
  b32ac5e4bcae0f9e8a25327e30674cf4f81ade62b6fb6fdf4e561f5099ec396a small_repo_prefix/heads/other_bookmark
 
@@ -108,14 +108,14 @@
  > LD
  > # exists: LC $LC
  > # exists: LD $LD
- > # bookmark: LC main
+ > # bookmark: LC master_bookmark
  > # bookmark: LD common_bookmark
  > EOF
  LA=b32ac5e4bcae0f9e8a25327e30674cf4f81ade62b6fb6fdf4e561f5099ec396a
  LB=b4534a5a2c4570a7f76b86de82927a8b35da5bc69f7618fe6724f09fa183ad25
  LC=207c0c64826e67a9fde5993ff2789ed838376b082656f49ce239536193a832bd
  LD=d52189c4c92bc5d3c99269e794afb72c31caf9ed4eba39abbb3c2739f010096d
--- move heads/main in the small repo (the common pushrebase bookmark)
+-- move heads/master_bookmark in the small repo (the common pushrebase bookmark)
  $ testtool_drawdag -R small << EOF
  > SA-SB-SC
  > \ 
@@ -125,7 +125,7 @@
  > # exists: SC $SC
  > # exists: SD $SD
  > # exists: SE $SE
- > # bookmark: SC heads/main
+ > # bookmark: SC heads/master_bookmark
  > EOF
  SA=7c5a873e5729acecbe37ac89b3f7cbc4292cd8cbcff60f39126ed74d9f55e05e
  SB=dd912eedd1899b2403fc507d74bec70bda5f4a035cd9851478847bc2b35dfa3f
@@ -140,16 +140,16 @@
  * queue size is 1 (glob)
  * processing log entry #4 (glob)
  * 2 unsynced ancestors of 9c27228ce4dda0e66c126c4560521707a6fc3e48d79d471bede547a76987d3be (glob)
- * syncing dd912eedd1899b2403fc507d74bec70bda5f4a035cd9851478847bc2b35dfa3f via pushrebase for main (glob)
+ * syncing dd912eedd1899b2403fc507d74bec70bda5f4a035cd9851478847bc2b35dfa3f via pushrebase for master_bookmark (glob)
  * changeset dd912eedd1899b2403fc507d74bec70bda5f4a035cd9851478847bc2b35dfa3f synced as ccca231a326f5060eebc66ed1f1ad6aaa1490f1d7faa40cc469e59bf5a4e1ee9 * (glob)
- * syncing 9c27228ce4dda0e66c126c4560521707a6fc3e48d79d471bede547a76987d3be via pushrebase for main (glob)
+ * syncing 9c27228ce4dda0e66c126c4560521707a6fc3e48d79d471bede547a76987d3be via pushrebase for master_bookmark (glob)
  * changeset 9c27228ce4dda0e66c126c4560521707a6fc3e48d79d471bede547a76987d3be synced as e3c1a924a6c56bf0dfbd0173601239a4776b6ed17075617270c27c80456e12fb * (glob)
  * successful sync bookmark update log #4 (glob)
  * X Repo Sync execution finished from small repo small to large repo large (glob)
 
  $ mononoke_newadmin bookmarks --repo-name large list
  d52189c4c92bc5d3c99269e794afb72c31caf9ed4eba39abbb3c2739f010096d common_bookmark
- e3c1a924a6c56bf0dfbd0173601239a4776b6ed17075617270c27c80456e12fb main
+ e3c1a924a6c56bf0dfbd0173601239a4776b6ed17075617270c27c80456e12fb master_bookmark
  b32ac5e4bcae0f9e8a25327e30674cf4f81ade62b6fb6fdf4e561f5099ec396a small_repo_prefix/heads/common_bookmark
  b32ac5e4bcae0f9e8a25327e30674cf4f81ade62b6fb6fdf4e561f5099ec396a small_repo_prefix/heads/other_bookmark
 
@@ -196,7 +196,7 @@
 -- check the state of bookmarks in the large repo
  $ mononoke_newadmin bookmarks --repo-name large list
  d52189c4c92bc5d3c99269e794afb72c31caf9ed4eba39abbb3c2739f010096d common_bookmark
- e3c1a924a6c56bf0dfbd0173601239a4776b6ed17075617270c27c80456e12fb main
+ e3c1a924a6c56bf0dfbd0173601239a4776b6ed17075617270c27c80456e12fb master_bookmark
  b149e7a688c2bac6a2f25dc4b846060f774967ae82eeac54cc1a7c148b215b27 small_repo_prefix/heads/common_bookmark
  f2f336ed26e996561dc4156ce6a5b647a30abe6b0584615c5739caaf8f6d153e small_repo_prefix/heads/other_bookmark
  ccca231a326f5060eebc66ed1f1ad6aaa1490f1d7faa40cc469e59bf5a4e1ee9 small_repo_prefix/tags/release_b

eden/mononoke/tests/integration/cross_repo/test-cross-repo-commit-sync-live-via-extra.t

@@ -96,10 +96,6 @@ After the change
  $ cd "$TESTTMP/small-hg-client"
  $ hg pull -r $X
  pulling from mono:small-mon
- no changes found
- adding changesets
- adding manifests
- adding file changes
  $ hg up -q $X
  $ log -r .^::.
  @ before config change [public;rev=2;bc6a206054d0] default/master_bookmark

eden/mononoke/tests/integration/cross_repo/test-cross-repo-commit-sync-live.t

@@ -18,6 +18,9 @@
  Starting Mononoke server
  $ init_local_large_small_clones
 
+FIXME: enable selective pull
+ $ setconfig remotenames.selectivepull=false
+
 -- Start up the sync job in the background
  $ mononoke_x_repo_sync_forever $REPOIDSMALL $REPOIDLARGE
 

eden/mononoke/tests/integration/cross_repo/test-cross-repo-commit-sync-merge.t

@@ -16,6 +16,9 @@ setup configuration
  ls: cannot access *: No such file or directory (glob)
  [2]
 
+FIXME: enable selective pull
+ $ setconfig remotenames.selectivepull=false
+
 setup hg server repos
  $ function createfile { mkdir -p "$(dirname $1)" && echo "$1" > "$1" && hg add -q "$1"; }
 

eden/mononoke/tests/integration/cross_repo/test-cross-repo-commit-sync-regex.t

@@ -20,6 +20,7 @@
 
 -- setup hg client repos
  $ cd "$TESTTMP"
+ $ setconfig remotenames.selectivepulldefault=master_bookmark,somebookmark
  $ hg clone -q mono:fbs-mon fbs-hg-cnt --noupdate
  $ hg clone -q mono:ovr-mon ovr-hg-cnt --noupdate
  $ hg clone -q mono:meg-mon meg-hg-cnt --noupdate

eden/mononoke/tests/integration/cross_repo/test-cross-repo-commit-sync-with-git-clash-from-hg-extra.t

@@ -10,7 +10,7 @@
  $ export SUBMODULE_REPO_NAME="small_repo"
  $ export SUBMODULE_REPO_ID=11
  $ export COMMIT_DATE="1985-09-04T00:00:00.00Z"
- $ export MASTER_BOOKMARK_NAME="master"
+ $ export MASTER_BOOKMARK_NAME="master_bookmark"
 
 -- Use large repo as the default repo
  $ export REPONAME="$LARGE_REPO_NAME"
@@ -19,7 +19,6 @@
  > [extensions]
  > rebase=
  > pushrebase=
- > remotenames=
  > EOF
 
 
@@ -37,7 +36,7 @@ Setup configuration
  $ testtool_drawdag -R "$LARGE_REPO_NAME" --no-default-files <<EOF
  > A
  > # modify: A "large_repo_root.txt" "file in large repo root"
- > # bookmark: A master
+ > # bookmark: A master_bookmark
  > EOF
  A=3f09a27a52abfe9117e13ec42027d0220ed88ce2b8ad976cf49e5b6d28fc2baa
 
@@ -50,7 +49,7 @@ Create small repo commits
  > # modify: B "bar/c.txt" "random change"
  > # modify: B "foo/d" "another random change"
  > # copy: C "foo/b.txt" "copying file from bar into foo" B "bar/b.txt"
- > # bookmark: C master
+ > # bookmark: C master_bookmark
  > EOF
  A=7e97054c51a17ea2c03cd5184826b6a7556d141d57c5a1641bbd62c0854d1a36
  B=2999dcf517994fe94506b62e5a9c54f851abd4c4964f98fdd701c013abd9c0c3
@@ -104,7 +103,7 @@ Create small repo commits
 
 -- Prepare large repo
  $ cd "$TESTTMP/$LARGE_REPO_NAME"
- $ hg pull -q && hg co -q master
+ $ hg pull -q && hg co -q master_bookmark
  $ enable commitcloud infinitepush # to push commits to server
 
 -- Create a large repo commit
@@ -121,7 +120,7 @@ Create small repo commits
  $ echo "change file" > large_repo_file.txt
  $ hg commit -Aq -m "change large repo file AGAIN" 
  $ REBASE_TARGET=$(hg whereami)
- $ hg push -q --to master
+ $ hg push -q --to master_bookmark
 
  $ hg co -q $ORIGINAL_HG_COMMIT
 

eden/mononoke/tests/integration/cross_repo/test-cross-repo-commit-sync.t

@@ -21,6 +21,7 @@
 
 -- setup hg client repos
  $ cd "$TESTTMP"
+ $ setconfig remotenames.selectivepulldefault=master_bookmark,somebook,fbsource/somebook
  $ hg clone -q mono:fbs-mon fbs-hg-cnt --noupdate
  $ hg clone -q mono:ovr-mon ovr-hg-cnt --noupdate
  $ hg clone -q mono:meg-mon meg-hg-cnt --noupdate

eden/mononoke/tests/integration/cross_repo/test-cross-repo-empty-backsync.t

@@ -20,6 +20,9 @@
  Starting Mononoke server
  $ init_local_large_small_clones
 
+FIXME: enable selective pull
+ $ setconfig remotenames.selectivepull=false
+
 -- Empty commit sync
  $ cd "$TESTTMP"/large-hg-client
  $ quiet hg up master_bookmark

eden/mononoke/tests/integration/cross_repo/test-cross-repo-initial-import-gitsubmodules-expand-recursive.t

@@ -43,6 +43,7 @@ Run the x-repo with submodules setup
  $ killandwait $MONONOKE_PID
  $ start_and_wait_for_mononoke_server
 
+
 -- Setup git repos A, B and C
  $ setup_git_repos_a_b_c
  
@@ -118,7 +119,7 @@ Run the x-repo with submodules setup
  NOTE: Importing repo A commits into large repo
  IMPORT_CONFIG_VERSION_NAME: INITIAL_IMPORT_SYNC_CONFIG
  FINAL_CONFIG_VERSION_NAME: INITIAL_IMPORT_SYNC_CONFIG
- Large repo MASTER_BOOKMARK_NAME: master
+ Large repo MASTER_BOOKMARK_NAME: master_bookmark
  SMALL_REPO_FOLDER: smallrepofolder1
  
  GIT_REPO_A_HEAD: eef414bd5fc8f7dcc129318276af6945117fe32bb5cfda6b0e6d43036107f61c
@@ -139,7 +140,7 @@ Run the x-repo with submodules setup
  
  
  NOTE: Large repo bookmarks
- 54a6db91baf1c10921369339b50e5a174a7ca82e master
+ 54a6db91baf1c10921369339b50e5a174a7ca82e master_bookmark
  
  IMPORTED_HEAD: 6e3217760eada6926186d7cb48f4f24bd8a734ad615aec528065a0912dec6cba
  
@@ -275,7 +276,7 @@ Run the x-repo with submodules setup
  ),
  }
  UNSAFE: changing mapping version during pushrebase to INITIAL_IMPORT_SYNC_CONFIG
- syncing eef414bd5fc8f7dcc129318276af6945117fe32bb5cfda6b0e6d43036107f61c via pushrebase for master
+ syncing eef414bd5fc8f7dcc129318276af6945117fe32bb5cfda6b0e6d43036107f61c via pushrebase for master_bookmark
  changeset eef414bd5fc8f7dcc129318276af6945117fe32bb5cfda6b0e6d43036107f61c synced as 04190d634e49d29bf87edffb012f42f9f5e49b5b66e99714f17fcd4ef3f3e294 in * (glob)
  successful sync
  X Repo Sync execution finished from small repo small_repo to large repo large_repo
@@ -445,7 +446,7 @@ Run the x-repo with submodules setup
  
  NOTE: Update those changes in repo B
  From $TESTTMP/git-repo-c
- 114b61c..810d4f5 master -> origin/master
+ 114b61c..810d4f5 master_bookmark -> origin/master_bookmark
  Submodule path 'git-repo-c': checked out '810d4f53650b0fd891ad367ccfd8fa6067d93937'
  0597690 Delete files in repo B
  c9e2185 Update submodule C in repo B
@@ -459,10 +460,10 @@ Run the x-repo with submodules setup
  
  NOTE: Update submodule b in A
  From $TESTTMP/git-repo-b
- 776166f..0597690 master -> origin/master
+ 776166f..0597690 master_bookmark -> origin/master_bookmark
  Submodule path 'git-repo-b': checked out '0597690a839ce11a250139dae33ee85d9772a47a'
  From $TESTTMP/git-repo-c
- 114b61c..810d4f5 master -> origin/master
+ 114b61c..810d4f5 master_bookmark -> origin/master_bookmark
  Submodule path 'repo_c': checked out '810d4f53650b0fd891ad367ccfd8fa6067d93937'
  
  
@@ -479,7 +480,7 @@ Run the x-repo with submodules setup
  8c33a27 Add root_file
 
  $ mononoke_newadmin bookmarks -R "$SUBMODULE_REPO_NAME" list -S hg
- heads/master
+ heads/master_bookmark
 
 -- Import the changes from the git repos B and C into their Mononoke repos
  $ REPOID="$REPO_C_ID" QUIET_LOGGING_LOG_FILE="$TESTTMP/gitimport_repo_c.out" \
@@ -491,7 +492,7 @@ Run the x-repo with submodules setup
  > --bypass-readonly --generate-bookmarks missing-for-commit "$GIT_REPO_B_HEAD"
 
 Set up live forward syncer, which should sync all commits in small repo's (repo A)
-heads/master bookmark to large repo's master bookmark via pushrebase
+heads/master_bookmark bookmark to large repo's master_bookmark bookmark via pushrebase
  $ touch $TESTTMP/xreposync.out
  $ with_stripped_logs mononoke_x_repo_sync_forever "$SUBMODULE_REPO_ID" "$LARGE_REPO_ID" 
 
@@ -503,8 +504,9 @@ heads/master bookmark to large repo's master bookmark via pushrebase
  $ QUIET_LOGGING_LOG_FILE="$TESTTMP/xrepo_sync_last_logs.out" with_stripped_logs wait_for_xrepo_sync 2
 
  $ cd "$TESTTMP/$LARGE_REPO_NAME"
+ $ wait_for_bookmark_move_away_edenapi large_repo master_bookmark $(hg whereami)
  $ hg pull -q 
- $ hg co -q master
+ $ hg co -q master_bookmark
 
  $ hg log --graph -T '{node} {desc}\n' -r "all()"
  @ d246b01a5a5baff205958295aa764916ae288291 Remove repo C submodule from repo A
@@ -625,14 +627,14 @@ TODO(T174902563): Fix deletion of submodules in EXPAND submodule action.
  0597690a839ce11a250139dae33ee85d9772a47a (no-eol)
 
 -- Also check that our two binaries that can verify working copy are able to deal with expansions
- $ REPOIDLARGE=$LARGE_REPO_ID REPOIDSMALL=$SUBMODULE_REPO_ID verify_wc $(hg log -r master -T '{node}') |& strip_glog
+ $ REPOIDLARGE=$LARGE_REPO_ID REPOIDSMALL=$SUBMODULE_REPO_ID verify_wc $(hg log -r master_bookmark -T '{node}') |& strip_glog
 
 -- The check-push-redirection-prereqs should behave the same both ways but let's verify it (we had bugs where it didn't)
 -- (those outputs are still not correct but that's expected)
- $ quiet_grep "all is well" -- with_stripped_logs megarepo_tool_multirepo --source-repo-id $SUBMODULE_REPO_ID --target-repo-id $LARGE_REPO_ID check-push-redirection-prereqs "heads/master" "master" "$LATEST_CONFIG_VERSION_NAME" | strip_glog | tee $TESTTMP/push_redir_prereqs_small_large
+ $ quiet_grep "all is well" -- with_stripped_logs megarepo_tool_multirepo --source-repo-id $SUBMODULE_REPO_ID --target-repo-id $LARGE_REPO_ID check-push-redirection-prereqs "heads/master_bookmark" "master_bookmark" "$LATEST_CONFIG_VERSION_NAME" | strip_glog | tee $TESTTMP/push_redir_prereqs_small_large
  all is well!
 
- $ quiet_grep "all is well" -- with_stripped_logs megarepo_tool_multirepo --source-repo-id $LARGE_REPO_ID --target-repo-id $SUBMODULE_REPO_ID check-push-redirection-prereqs "master" "heads/master" "$LATEST_CONFIG_VERSION_NAME" | strip_glog | tee $TESTTMP/push_redir_prereqs_large_small
+ $ quiet_grep "all is well" -- with_stripped_logs megarepo_tool_multirepo --source-repo-id $LARGE_REPO_ID --target-repo-id $SUBMODULE_REPO_ID check-push-redirection-prereqs "master_bookmark" "heads/master_bookmark" "$LATEST_CONFIG_VERSION_NAME" | strip_glog | tee $TESTTMP/push_redir_prereqs_large_small
  all is well!
  $ diff -wbBdu $TESTTMP/push_redir_prereqs_small_large $TESTTMP/push_redir_prereqs_large_small
 
@@ -641,11 +643,11 @@ TODO(T174902563): Fix deletion of submodules in EXPAND submodule action.
  $ echo corrupt > smallrepofolder1/git-repo-b/git-repo-c/choo3 
  $ echo corrupt > smallrepofolder1/.x-repo-submodule-git-repo-b
  $ hg commit -m "submodule corruption"
- $ hg push -q --to master
- $ quiet_grep "mismatch" -- megarepo_tool_multirepo --source-repo-id $SUBMODULE_REPO_ID --target-repo-id $LARGE_REPO_ID check-push-redirection-prereqs "heads/master" "master" "$LATEST_CONFIG_VERSION_NAME" | strip_glog | tee $TESTTMP/push_redir_prereqs_small_large
+ $ hg push -q --to master_bookmark
+ $ quiet_grep "mismatch" -- megarepo_tool_multirepo --source-repo-id $SUBMODULE_REPO_ID --target-repo-id $LARGE_REPO_ID check-push-redirection-prereqs "heads/master_bookmark" "master_bookmark" "$LATEST_CONFIG_VERSION_NAME" | strip_glog | tee $TESTTMP/push_redir_prereqs_small_large
  submodule expansion mismatch: Failed to fetch content from content id 06a434694d9172d617062abd92f015f73978fb17dd6bcc54e708cd2c6f247970 file containing the submodule's git commit hash
 
- $ quiet_grep "mismatch" -- megarepo_tool_multirepo --source-repo-id $LARGE_REPO_ID --target-repo-id $SUBMODULE_REPO_ID check-push-redirection-prereqs "master" "heads/master" "$LATEST_CONFIG_VERSION_NAME" | sort | tee $TESTTMP/push_redir_prereqs_large_small
+ $ quiet_grep "mismatch" -- megarepo_tool_multirepo --source-repo-id $LARGE_REPO_ID --target-repo-id $SUBMODULE_REPO_ID check-push-redirection-prereqs "master_bookmark" "heads/master_bookmark" "$LATEST_CONFIG_VERSION_NAME" | sort | tee $TESTTMP/push_redir_prereqs_large_small
  submodule expansion mismatch: Failed to fetch content from content id 06a434694d9172d617062abd92f015f73978fb17dd6bcc54e708cd2c6f247970 file containing the submodule's git commit hash
 
  $ diff -wbBdu $TESTTMP/push_redir_prereqs_small_large $TESTTMP/push_redir_prereqs_large_small
@@ -712,7 +714,7 @@ TODO(T174902563): Fix deletion of submodules in EXPAND submodule action.
 -- Test backsyncing (i.e. large to small)
 
  $ cd "$TESTTMP/$LARGE_REPO_NAME" || exit
- $ hg pull -q && hg co -q master 
+ $ hg pull -q && hg co -q master_bookmark 
  $ hg status
  $ hg co -q .^ # go before the commit that corrupts submodules
  $ hg status
@@ -823,7 +825,7 @@ TODO(T174902563): Fix deletion of submodules in EXPAND submodule action.
 -- EXPECT: commit isn't synced and returns working copy equivalent instead
  $ echo "changing large repo file" > file_in_large_repo.txt
  $ hg commit -A -m "Changing large repo file" 
- $ hg push -q -r . --to master --non-forward-move --pushvar NON_FAST_FORWARD=true
+ $ hg push -q -r . --to master_bookmark --non-forward-move --pushvar NON_FAST_FORWARD=true
  $ backsync_get_info_and_derive_data
  Processing commit: Changing large repo file
  Commit hash: 48021e7aeafd324f9976f551aea60aa88dd9f61a
@@ -847,7 +849,7 @@ TODO(T174902563): Fix deletion of submodules in EXPAND submodule action.
 -- EXPECT: commit is backsynced normally because it doesn't touch submodule expansions
  $ echo "changing small repo file" > smallrepofolder1/regular_dir/aardvar
  $ hg commit -A -m "Changing small repo in large repo (not submodule)" 
- $ hg push -q -r . --to master --non-forward-move --pushvar NON_FAST_FORWARD=true
+ $ hg push -q -r . --to master_bookmark --non-forward-move --pushvar NON_FAST_FORWARD=true
  $ backsync_get_info_and_derive_data
  Processing commit: Changing small repo in large repo (not submodule)
  Commit hash: 35e70dc7f37c3f51876a0f017a733a13809bef32
@@ -905,7 +907,7 @@ TODO(T174902563): Fix deletion of submodules in EXPAND submodule action.
  
  NOTE: Update repo_c submodule in git repo_b
  From $TESTTMP/git-repo-c
- 810d4f5..5b44771 master -> origin/master
+ 810d4f5..5b44771 master_bookmark -> origin/master_bookmark
  Submodule path 'git-repo-c': checked out '5b447718cdc49d6289690f68b11f6b8a3002a396'
  GIT_REPO_B_HEAD: 065ee332e835cab7f781b87decb8c07bd5bb7fe129fc3aed47f4fa07697b65de
  REPO_B_GIT_COMMIT_HASH: 538924163436e89a3aa25a686075afb7182ec9c1