(CommandList
  children: [
    (Assignment
      keyword: Assign_None
      pairs: [
        (assign_pair
          lhs: (LhsName name:test_description)
          op: Equal
          rhs: {(SQ <"git p4 tests for p4 branches">)}
          spids: [4]
        )
      ]
      spids: [4]
    )
    (C {(.)} {(./lib-git-p4.sh)})
    (C {(test_expect_success)} {(SQ <"start p4d">)} {(SQ <"\n"> <"\tstart_p4d\n">)})
    (C {(test_expect_success)} {(SQ <"basic p4 branches">)} 
      {
        (SQ <"\n"> <"\t(\n"> <"\t\tcd \"$cli\" &&\n"> <"\t\tmkdir -p main &&\n"> <"\n"> 
          <"\t\techo f1 >main/f1 &&\n"> <"\t\tp4 add main/f1 &&\n"> <"\t\tp4 submit -d \"main/f1\" &&\n"> <"\n"> <"\t\techo f2 >main/f2 &&\n"> 
          <"\t\tp4 add main/f2 &&\n"> <"\t\tp4 submit -d \"main/f2\" &&\n"> <"\n"> 
          <"\t\tp4 integrate //depot/main/... //depot/branch1/... &&\n"> <"\t\tp4 submit -d \"integrate main to branch1\" &&\n"> <"\n"> <"\t\techo f4 >main/f4 &&\n"> 
          <"\t\tp4 add main/f4 &&\n"> <"\t\tp4 submit -d \"main/f4\" &&\n"> <"\n"> <"\t\techo f5 >branch1/f5 &&\n"> 
          <"\t\tp4 add branch1/f5 &&\n"> <"\t\tp4 submit -d \"branch1/f5\" &&\n"> <"\n"> <"\t\tp4 branch -i <<-EOF &&\n"> 
          <"\t\tBranch: branch2\n"> <"\t\tView: //depot/main/... //depot/branch2/...\n"> <"\t\tEOF\n"> <"\n"> 
          <"\t\tp4 integrate -b branch2 &&\n"> <"\t\tp4 submit -d \"integrate main to branch2\" &&\n"> <"\n"> <"\t\techo f7 >branch2/f7 &&\n"> 
          <"\t\tp4 add branch2/f7 &&\n"> <"\t\tp4 submit -d \"branch2/f7\" &&\n"> <"\n"> <"\t\techo f8 >main/f8 &&\n"> 
          <"\t\tp4 add main/f8 &&\n"> <"\t\tp4 submit -d \"main/f8\"\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"import main, no branch detection">)} 
      {
        (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> 
          <"\tgit p4 clone --dest=\"$git\" //depot/main@all &&\n"> <"\t(\n"> <"\t\tcd \"$git\" &&\n"> <"\t\tgit log --oneline --graph --decorate --all &&\n"> 
          <"\t\tgit rev-list master >wc &&\n"> <"\t\ttest_line_count = 4 wc\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"import branch1, no branch detection">)} 
      {
        (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> 
          <"\tgit p4 clone --dest=\"$git\" //depot/branch1@all &&\n"> <"\t(\n"> <"\t\tcd \"$git\" &&\n"> <"\t\tgit log --oneline --graph --decorate --all &&\n"> 
          <"\t\tgit rev-list master >wc &&\n"> <"\t\ttest_line_count = 2 wc\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"import branch2, no branch detection">)} 
      {
        (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> 
          <"\tgit p4 clone --dest=\"$git\" //depot/branch2@all &&\n"> <"\t(\n"> <"\t\tcd \"$git\" &&\n"> <"\t\tgit log --oneline --graph --decorate --all &&\n"> 
          <"\t\tgit rev-list master >wc &&\n"> <"\t\ttest_line_count = 2 wc\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"import depot, no branch detection">)} 
      {
        (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> 
          <"\tgit p4 clone --dest=\"$git\" //depot@all &&\n"> <"\t(\n"> <"\t\tcd \"$git\" &&\n"> <"\t\tgit log --oneline --graph --decorate --all &&\n"> 
          <"\t\tgit rev-list master >wc &&\n"> <"\t\ttest_line_count = 8 wc\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"import depot, branch detection">)} 
      {
        (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> 
          <"\tgit p4 clone --dest=\"$git\" --detect-branches //depot@all &&\n"> <"\t(\n"> <"\t\tcd \"$git\" &&\n"> <"\n"> <"\t\tgit log --oneline --graph --decorate --all &&\n"> <"\n"> 
          <"\t\t# 4 main commits\n"> <"\t\tgit rev-list master >wc &&\n"> <"\t\ttest_line_count = 4 wc &&\n"> <"\n"> 
          <"\t\t# 3 main, 1 integrate, 1 on branch2\n"> <"\t\tgit rev-list p4/depot/branch2 >wc &&\n"> <"\t\ttest_line_count = 5 wc &&\n"> <"\n"> 
          <"\t\t# no branch1, since no p4 branch created for it\n"> <"\t\ttest_must_fail git show-ref p4/depot/branch1\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"import depot, branch detection, branchList branch definition">)} 
      {
        (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> <"\ttest_create_repo \"$git\" &&\n"> 
          <"\t(\n"> <"\t\tcd \"$git\" &&\n"> <"\t\tgit config git-p4.branchList main:branch1 &&\n"> 
          <"\t\tgit p4 clone --dest=. --detect-branches //depot@all &&\n"> <"\n"> <"\t\tgit log --oneline --graph --decorate --all &&\n"> <"\n"> <"\t\t# 4 main commits\n"> 
          <"\t\tgit rev-list master >wc &&\n"> <"\t\ttest_line_count = 4 wc &&\n"> <"\n"> <"\t\t# 3 main, 1 integrate, 1 on branch2\n"> 
          <"\t\tgit rev-list p4/depot/branch2 >wc &&\n"> <"\t\ttest_line_count = 5 wc &&\n"> <"\n"> <"\t\t# 2 main, 1 integrate, 1 on branch1\n"> 
          <"\t\tgit rev-list p4/depot/branch1 >wc &&\n"> <"\t\ttest_line_count = 4 wc\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"restart p4d">)} {(SQ <"\n"> <"\tkill_p4d &&\n"> <"\tstart_p4d\n">)})
    (C {(test_expect_success)} {(SQ <"add simple p4 branches">)} 
      {
        (SQ <"\n"> <"\t(\n"> <"\t\tcd \"$cli\" &&\n"> <"\t\tmkdir branch1 &&\n"> <"\t\tcd branch1 &&\n"> 
          <"\t\techo file1 >file1 &&\n"> <"\t\techo file2 >file2 &&\n"> <"\t\tp4 add file1 file2 &&\n"> 
          <"\t\tp4 submit -d \"Create branch1\" &&\n"> <"\t\tp4 integrate //depot/branch1/... //depot/branch2/... &&\n"> 
          <"\t\tp4 submit -d \"Integrate branch2 from branch1\" &&\n"> <"\t\techo file3 >file3 &&\n"> <"\t\tp4 add file3 &&\n"> 
          <"\t\tp4 submit -d \"add file3 in branch1\" &&\n"> <"\t\tp4 open file2 &&\n"> <"\t\techo update >>file2 &&\n"> 
          <"\t\tp4 submit -d \"update file2 in branch1\" &&\n"> <"\t\tp4 integrate //depot/branch1/... //depot/branch3/... &&\n"> 
          <"\t\tp4 submit -d \"Integrate branch3 from branch1\"\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"git p4 clone simple branches">)} 
      {
        (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> <"\ttest_create_repo \"$git\" &&\n"> 
          <"\t(\n"> <"\t\tcd \"$git\" &&\n"> <"\t\tgit config git-p4.branchList branch1:branch2 &&\n"> 
          <"\t\tgit config --add git-p4.branchList branch1:branch3 &&\n"> <"\t\tgit p4 clone --dest=. --detect-branches //depot@all &&\n"> 
          <"\t\tgit log --all --graph --decorate --stat &&\n"> <"\t\tgit reset --hard p4/depot/branch1 &&\n"> <"\t\ttest -f file1 &&\n"> <"\t\ttest -f file2 &&\n"> 
          <"\t\ttest -f file3 &&\n"> <"\t\tgrep update file2 &&\n"> <"\t\tgit reset --hard p4/depot/branch2 &&\n"> 
          <"\t\ttest -f file1 &&\n"> <"\t\ttest -f file2 &&\n"> <"\t\ttest ! -f file3 &&\n"> <"\t\t! grep update file2 &&\n"> 
          <"\t\tgit reset --hard p4/depot/branch3 &&\n"> <"\t\ttest -f file1 &&\n"> <"\t\ttest -f file2 &&\n"> <"\t\ttest -f file3 &&\n"> 
          <"\t\tgrep update file2 &&\n"> <"\t\tcd \"$cli\" &&\n"> <"\t\tcd branch1 &&\n"> <"\t\tp4 edit file2 &&\n"> 
          <"\t\techo file2_ >>file2 &&\n"> <"\t\tp4 submit -d \"update file2 in branch1\" &&\n"> <"\t\tcd \"$git\" &&\n"> 
          <"\t\tgit reset --hard p4/depot/branch1 &&\n"> <"\t\tgit p4 rebase &&\n"> <"\t\tgrep file2_ file2\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"git p4 add complex branches">)} 
      {
        (SQ <"\n"> <"\t(\n"> <"\t\tcd \"$cli\" &&\n"> 
          <"\t\tchangelist=$(p4 changes -m1 //depot/... | cut -d\" \" -f2) &&\n"> <"\t\tchangelist=$(($changelist - 5)) &&\n"> 
          <"\t\tp4 integrate //depot/branch1/...@$changelist //depot/branch4/... &&\n"> <"\t\tp4 submit -d \"Integrate branch4 from branch1@${changelist}\" &&\n"> 
          <"\t\tchangelist=$(($changelist + 2)) &&\n"> <"\t\tp4 integrate //depot/branch1/...@$changelist //depot/branch5/... &&\n"> 
          <"\t\tp4 submit -d \"Integrate branch5 from branch1@${changelist}\"\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"git p4 clone complex branches">)} 
      {
        (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> <"\ttest_create_repo \"$git\" &&\n"> 
          <"\t(\n"> <"\t\tcd \"$git\" &&\n"> <"\t\tgit config git-p4.branchList branch1:branch2 &&\n"> 
          <"\t\tgit config --add git-p4.branchList branch1:branch3 &&\n"> <"\t\tgit config --add git-p4.branchList branch1:branch4 &&\n"> 
          <"\t\tgit config --add git-p4.branchList branch1:branch5 &&\n"> <"\t\tgit p4 clone --dest=. --detect-branches //depot@all &&\n"> 
          <"\t\tgit log --all --graph --decorate --stat &&\n"> <"\t\tgit reset --hard p4/depot/branch1 &&\n"> <"\t\ttest_path_is_file file1 &&\n"> 
          <"\t\ttest_path_is_file file2 &&\n"> <"\t\ttest_path_is_file file3 &&\n"> <"\t\tgrep update file2 &&\n"> 
          <"\t\tgit reset --hard p4/depot/branch2 &&\n"> <"\t\ttest_path_is_file file1 &&\n"> <"\t\ttest_path_is_file file2 &&\n"> 
          <"\t\ttest_path_is_missing file3 &&\n"> <"\t\t! grep update file2 &&\n"> <"\t\tgit reset --hard p4/depot/branch3 &&\n"> 
          <"\t\ttest_path_is_file file1 &&\n"> <"\t\ttest_path_is_file file2 &&\n"> <"\t\ttest_path_is_file file3 &&\n"> 
          <"\t\tgrep update file2 &&\n"> <"\t\tgit reset --hard p4/depot/branch4 &&\n"> <"\t\ttest_path_is_file file1 &&\n"> 
          <"\t\ttest_path_is_file file2 &&\n"> <"\t\ttest_path_is_missing file3 &&\n"> <"\t\t! grep update file2 &&\n"> 
          <"\t\tgit reset --hard p4/depot/branch5 &&\n"> <"\t\ttest_path_is_file file1 &&\n"> <"\t\ttest_path_is_file file2 &&\n"> 
          <"\t\ttest_path_is_file file3 &&\n"> <"\t\t! grep update file2 &&\n"> <"\t\ttest_must_fail git show-ref --verify refs/git-p4-tmp\n"> 
          <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"git p4 submit to two branches in a single changelist">)} 
      {
        (SQ <"\n"> <"\t(\n"> <"\t\tcd \"$cli\" &&\n"> 
          <"\t\tp4 integrate //depot/branch3/file3 //depot/branch4/file3 &&\n"> <"\t\tp4 delete //depot/branch3/file3 &&\n"> 
          <"\t\tp4 submit -d \"Move branch3/file3 to branch4/file3\"\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"git p4 sync changes to two branches in the same changelist">)} 
      {
        (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> <"\ttest_create_repo \"$git\" &&\n"> 
          <"\t(\n"> <"\t\tcd \"$git\" &&\n"> <"\t\tgit config git-p4.branchList branch1:branch2 &&\n"> 
          <"\t\tgit config --add git-p4.branchList branch1:branch3 &&\n"> <"\t\tgit config --add git-p4.branchList branch1:branch4 &&\n"> 
          <"\t\tgit config --add git-p4.branchList branch1:branch5 &&\n"> <"\t\tgit p4 clone --dest=. --detect-branches //depot@all &&\n"> 
          <"\t\tgit log --all --graph --decorate --stat &&\n"> <"\t\tgit reset --hard p4/depot/branch1 &&\n"> <"\t\ttest_path_is_file file1 &&\n"> 
          <"\t\ttest_path_is_file file2 &&\n"> <"\t\ttest_path_is_file file3 &&\n"> <"\t\tgrep update file2 &&\n"> 
          <"\t\tgit reset --hard p4/depot/branch2 &&\n"> <"\t\ttest_path_is_file file1 &&\n"> <"\t\ttest_path_is_file file2 &&\n"> 
          <"\t\ttest_path_is_missing file3 &&\n"> <"\t\t! grep update file2 &&\n"> <"\t\tgit reset --hard p4/depot/branch3 &&\n"> 
          <"\t\ttest_path_is_file file1 &&\n"> <"\t\ttest_path_is_file file2 &&\n"> <"\t\ttest_path_is_missing file3 &&\n"> 
          <"\t\tgrep update file2 &&\n"> <"\t\tgit reset --hard p4/depot/branch4 &&\n"> <"\t\ttest_path_is_file file1 &&\n"> 
          <"\t\ttest_path_is_file file2 &&\n"> <"\t\ttest_path_is_file file3 &&\n"> <"\t\t! grep update file2 &&\n"> 
          <"\t\tgit reset --hard p4/depot/branch5 &&\n"> <"\t\ttest_path_is_file file1 &&\n"> <"\t\ttest_path_is_file file2 &&\n"> 
          <"\t\ttest_path_is_file file3 &&\n"> <"\t\t! grep update file2 &&\n"> <"\t\ttest_must_fail git show-ref --verify refs/git-p4-tmp\n"> 
          <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"git p4 file subset branch">)} 
      {
        (SQ <"\n"> <"\t(\n"> <"\t\tcd \"$cli\" &&\n"> 
          <"\t\tp4 integrate //depot/branch1/file1 //depot/branch6/file1 &&\n"> <"\t\tp4 submit -d \"Integrate file1 alone from branch1 to branch6\"\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_failure)} {(SQ <"git p4 clone file subset branch">)} 
      {
        (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> <"\ttest_create_repo \"$git\" &&\n"> 
          <"\t(\n"> <"\t\tcd \"$git\" &&\n"> <"\t\tgit config git-p4.branchList branch1:branch2 &&\n"> 
          <"\t\tgit config --add git-p4.branchList branch1:branch3 &&\n"> <"\t\tgit config --add git-p4.branchList branch1:branch4 &&\n"> 
          <"\t\tgit config --add git-p4.branchList branch1:branch5 &&\n"> <"\t\tgit config --add git-p4.branchList branch1:branch6 &&\n"> 
          <"\t\tgit p4 clone --dest=. --detect-branches //depot@all &&\n"> <"\t\tgit log --all --graph --decorate --stat &&\n"> <"\t\tgit reset --hard p4/depot/branch1 &&\n"> 
          <"\t\ttest_path_is_file file1 &&\n"> <"\t\ttest_path_is_file file2 &&\n"> <"\t\ttest_path_is_file file3 &&\n"> 
          <"\t\tgrep update file2 &&\n"> <"\t\tgit reset --hard p4/depot/branch2 &&\n"> <"\t\ttest_path_is_file file1 &&\n"> 
          <"\t\ttest_path_is_file file2 &&\n"> <"\t\ttest_path_is_missing file3 &&\n"> <"\t\t! grep update file2 &&\n"> 
          <"\t\tgit reset --hard p4/depot/branch3 &&\n"> <"\t\ttest_path_is_file file1 &&\n"> <"\t\ttest_path_is_file file2 &&\n"> 
          <"\t\ttest_path_is_missing file3 &&\n"> <"\t\tgrep update file2 &&\n"> <"\t\tgit reset --hard p4/depot/branch4 &&\n"> 
          <"\t\ttest_path_is_file file1 &&\n"> <"\t\ttest_path_is_file file2 &&\n"> <"\t\ttest_path_is_file file3 &&\n"> 
          <"\t\t! grep update file2 &&\n"> <"\t\tgit reset --hard p4/depot/branch5 &&\n"> <"\t\ttest_path_is_file file1 &&\n"> 
          <"\t\ttest_path_is_file file2 &&\n"> <"\t\ttest_path_is_file file3 &&\n"> <"\t\t! grep update file2 &&\n"> 
          <"\t\tgit reset --hard p4/depot/branch6 &&\n"> <"\t\ttest_path_is_file file1 &&\n"> <"\t\ttest_path_is_missing file2 &&\n"> 
          <"\t\ttest_path_is_missing file3\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"use-client-spec detect-branches setup">)} 
      {
        (SQ <"\n"> <"\trm -rf \"$cli\" &&\n"> <"\tmkdir \"$cli\" &&\n"> <"\t(\n"> 
          <"\t\tcd \"$cli\" &&\n"> <"\t\tclient_view \"//depot/usecs/... //client/...\" &&\n"> <"\t\tmkdir b1 &&\n"> 
          <"\t\techo b1/b1-file1 >b1/b1-file1 &&\n"> <"\t\tp4 add b1/b1-file1 &&\n"> <"\t\tp4 submit -d \"b1/b1-file1\" &&\n"> <"\n"> 
          <"\t\tp4 integrate //depot/usecs/b1/... //depot/usecs/b2/... &&\n"> <"\t\tp4 submit -d \"b1 -> b2\" &&\n"> <"\t\tp4 branch -i <<-EOF &&\n"> <"\t\tBranch: b2\n"> 
          <"\t\tView: //depot/usecs/b1/... //depot/usecs/b2/...\n"> <"\t\tEOF\n"> <"\n"> <"\t\techo b2/b2-file2 >b2/b2-file2 &&\n"> <"\t\tp4 add b2/b2-file2 &&\n"> 
          <"\t\tp4 submit -d \"b2/b2-file2\"\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"use-client-spec detect-branches files in top-level">)} 
      {
        (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> <"\ttest_create_repo \"$git\" &&\n"> 
          <"\t(\n"> <"\t\tcd \"$git\" &&\n"> 
          <"\t\tgit p4 sync --detect-branches --use-client-spec //depot/usecs@all &&\n"> <"\t\tgit checkout -b master p4/usecs/b1 &&\n"> <"\t\ttest_path_is_file b1-file1 &&\n"> 
          <"\t\ttest_path_is_missing b2-file2 &&\n"> <"\t\ttest_path_is_missing b1 &&\n"> <"\t\ttest_path_is_missing b2 &&\n"> <"\n"> 
          <"\t\tgit checkout -b b2 p4/usecs/b2 &&\n"> <"\t\ttest_path_is_file b1-file1 &&\n"> <"\t\ttest_path_is_file b2-file2 &&\n"> 
          <"\t\ttest_path_is_missing b1 &&\n"> <"\t\ttest_path_is_missing b2\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"use-client-spec detect-branches skips branches setup">)} 
      {
        (SQ <"\n"> <"\t(\n"> <"\t\tcd \"$cli\" &&\n"> <"\n"> 
          <"\t\tp4 integrate //depot/usecs/b1/... //depot/usecs/b3/... &&\n"> <"\t\tp4 submit -d \"b1 -> b3\" &&\n"> <"\t\tp4 branch -i <<-EOF &&\n"> <"\t\tBranch: b3\n"> 
          <"\t\tView: //depot/usecs/b1/... //depot/usecs/b3/...\n"> <"\t\tEOF\n"> <"\n"> <"\t\techo b3/b3-file3_1 >b3/b3-file3_1 &&\n"> 
          <"\t\techo b3/b3-file3_2 >b3/b3-file3_2 &&\n"> <"\t\tp4 add b3/b3-file3_1 &&\n"> <"\t\tp4 add b3/b3-file3_2 &&\n"> 
          <"\t\tp4 submit -d \"b3/b3-file3_1 b3/b3-file3_2\"\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"use-client-spec detect-branches skips branches">)} 
      {
        (SQ <"\n"> <"\tclient_view \"//depot/usecs/... //client/...\" \\\n"> 
          <"\t\t    \"-//depot/usecs/b3/... //client/b3/...\" &&\n"> <"\ttest_when_finished cleanup_git &&\n"> <"\ttest_create_repo \"$git\" &&\n"> <"\t(\n"> 
          <"\t\tcd \"$git\" &&\n"> <"\t\tgit p4 sync --detect-branches --use-client-spec //depot/usecs@all &&\n"> 
          <"\t\ttest_must_fail git rev-parse refs/remotes/p4/usecs/b3\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"use-client-spec detect-branches skips files in branches">)} 
      {
        (SQ <"\n"> <"\tclient_view \"//depot/usecs/... //client/...\" \\\n"> 
          <"\t\t    \"-//depot/usecs/b3/b3-file3_1 //client/b3/b3-file3_1\" &&\n"> <"\ttest_when_finished cleanup_git &&\n"> <"\ttest_create_repo \"$git\" &&\n"> <"\t(\n"> 
          <"\t\tcd \"$git\" &&\n"> <"\t\tgit p4 sync --detect-branches --use-client-spec //depot/usecs@all &&\n"> 
          <"\t\tgit checkout -b master p4/usecs/b3 &&\n"> <"\t\ttest_path_is_file b1-file1 &&\n"> <"\t\ttest_path_is_file b3-file3_2 &&\n"> 
          <"\t\ttest_path_is_missing b3-file3_1\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"restart p4d">)} {(SQ <"\n"> <"\tkill_p4d &&\n"> <"\tstart_p4d\n">)})
    (C {(test_expect_success)} {(SQ <"add simple p4 branches with common base folder on each branch">)} 
      {
        (SQ <"\n"> <"\t(\n"> <"\t\tcd \"$cli\" &&\n"> 
          <"\t\tclient_view \"//depot/branch1/base/... //client/branch1/...\" \\\n"> <"\t\t\t    \"//depot/branch1/base/dir/sub_file1 //client/branch1/sub_file1\" \\\n"> 
          <"\t\t\t    \"//depot/branch2/base/... //client/branch2/...\" \\\n"> <"\t\t\t    \"//depot/branch3/base/... //client/branch3/...\" &&\n"> <"\t\tmkdir -p branch1 &&\n"> 
          <"\t\tcd branch1 &&\n"> <"\t\techo file1 >file1 &&\n"> <"\t\techo file2 >file2 &&\n"> <"\t\tmkdir dir &&\n"> 
          <"\t\techo sub_file1 >sub_file1 &&\n"> <"\t\tp4 add file1 file2 sub_file1 &&\n"> <"\t\tp4 submit -d \"Create branch1\" &&\n"> 
          <"\t\tp4 integrate //depot/branch1/base/... //depot/branch2/base/... &&\n"> <"\t\tp4 submit -d \"Integrate branch2 from branch1\" &&\n"> <"\t\techo file3 >file3 &&\n"> 
          <"\t\tp4 add file3 &&\n"> <"\t\tp4 submit -d \"add file3 in branch1\" &&\n"> <"\t\tp4 open file2 &&\n"> 
          <"\t\techo update >>file2 &&\n"> <"\t\tp4 submit -d \"update file2 in branch1\" &&\n"> 
          <"\t\tp4 integrate //depot/branch1/base/... //depot/branch3/base/... &&\n"> <"\t\tp4 submit -d \"Integrate branch3 from branch1\"\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"git p4 clone simple branches with base folder on server side">)} 
      {
        (SQ <"\n"> <"\ttest_create_repo \"$git\" &&\n"> <"\t(\n"> <"\t\tcd \"$git\" &&\n"> 
          <"\t\tgit config git-p4.branchList branch1:branch2 &&\n"> <"\t\tgit config --add git-p4.branchList branch1:branch3 &&\n"> 
          <"\t\tgit p4 clone --dest=. --use-client-spec  --detect-branches //depot@all &&\n"> <"\t\tgit log --all --graph --decorate --stat &&\n"> <"\t\tgit reset --hard p4/depot/branch1 &&\n"> 
          <"\t\ttest -f file1 &&\n"> <"\t\ttest -f file2 &&\n"> <"\t\ttest -f file3 &&\n"> <"\t\ttest -f sub_file1 &&\n"> 
          <"\t\tgrep update file2 &&\n"> <"\t\tgit reset --hard p4/depot/branch2 &&\n"> <"\t\ttest -f file1 &&\n"> <"\t\ttest -f file2 &&\n"> 
          <"\t\ttest ! -f file3 &&\n"> <"\t\ttest -f sub_file1 &&\n"> <"\t\t! grep update file2 &&\n"> 
          <"\t\tgit reset --hard p4/depot/branch3 &&\n"> <"\t\ttest -f file1 &&\n"> <"\t\ttest -f file2 &&\n"> <"\t\ttest -f file3 &&\n"> 
          <"\t\ttest -f sub_file1 &&\n"> <"\t\tgrep update file2 &&\n"> <"\t\tcd \"$cli\" &&\n"> <"\t\tcd branch1 &&\n"> 
          <"\t\tp4 edit file2 &&\n"> <"\t\techo file2_ >>file2 &&\n"> <"\t\tp4 submit -d \"update file2 in branch1\" &&\n"> 
          <"\t\tcd \"$git\" &&\n"> <"\t\tgit reset --hard p4/depot/branch1 &&\n"> <"\t\tgit p4 rebase &&\n"> <"\t\tgrep file2_ file2\n"> 
          <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"Update a file in git side and submit to P4 using client view">)} 
      {
        (SQ <"\n"> <"\ttest_when_finished cleanup_git &&\n"> <"\t(\n"> <"\t\tcd \"$git\" &&\n"> 
          <"\t\tgit reset --hard p4/depot/branch1 &&\n"> <"\t\techo \"client spec\" >> file1 &&\n"> <"\t\tgit add -u . &&\n"> 
          <"\t\tgit commit -m \"update file1 in branch1\" &&\n"> <"\t\tgit config git-p4.skipSubmitEdit true &&\n"> <"\t\tgit p4 submit --verbose &&\n"> 
          <"\t\tcd \"$cli\" &&\n"> <"\t\tp4 sync ... &&\n"> <"\t\tcd branch1 &&\n"> <"\t\tgrep \"client spec\" file1\n"> <"\t)\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"kill p4d">)} {(SQ <"\n"> <"\tkill_p4d\n">)})
    (C {(test_done)})
  ]
)