(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "git p4 tests for p4 branches">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./lib-git-p4.sh]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "start p4d">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tstart_p4d\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "basic p4 branches">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$cli\" &&\n"> <LIT_CHARS "\t\tmkdir -p main &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\techo f1 >main/f1 &&\n"> <LIT_CHARS "\t\tp4 add main/f1 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"main/f1\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\techo f2 >main/f2 &&\n"> <LIT_CHARS "\t\tp4 add main/f2 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"main/f2\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tp4 integrate //depot/main/... //depot/branch1/... &&\n"> <LIT_CHARS "\t\tp4 submit -d \"integrate main to branch1\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\techo f4 >main/f4 &&\n"> <LIT_CHARS "\t\tp4 add main/f4 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"main/f4\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\techo f5 >branch1/f5 &&\n"> <LIT_CHARS "\t\tp4 add branch1/f5 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"branch1/f5\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tp4 branch -i <<-EOF &&\n"> <LIT_CHARS "\t\tBranch: branch2\n"> <LIT_CHARS "\t\tView: //depot/main/... //depot/branch2/...\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tp4 integrate -b branch2 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"integrate main to branch2\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\techo f7 >branch2/f7 &&\n"> <LIT_CHARS "\t\tp4 add branch2/f7 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"branch2/f7\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\techo f8 >main/f8 &&\n"> <LIT_CHARS "\t\tp4 add main/f8 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"main/f8\"\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "import main, no branch detection">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished cleanup_git &&\n"> <LIT_CHARS "\tgit p4 clone --dest=\"$git\" //depot/main@all &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\t\tgit log --oneline --graph --decorate --all &&\n"> <LIT_CHARS "\t\tgit rev-list master >wc &&\n"> <LIT_CHARS "\t\ttest_line_count = 4 wc\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "import branch1, no branch detection">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished cleanup_git &&\n"> <LIT_CHARS "\tgit p4 clone --dest=\"$git\" //depot/branch1@all &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\t\tgit log --oneline --graph --decorate --all &&\n"> <LIT_CHARS "\t\tgit rev-list master >wc &&\n"> <LIT_CHARS "\t\ttest_line_count = 2 wc\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "import branch2, no branch detection">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished cleanup_git &&\n"> <LIT_CHARS "\tgit p4 clone --dest=\"$git\" //depot/branch2@all &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\t\tgit log --oneline --graph --decorate --all &&\n"> <LIT_CHARS "\t\tgit rev-list master >wc &&\n"> <LIT_CHARS "\t\ttest_line_count = 2 wc\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "import depot, no branch detection">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished cleanup_git &&\n"> <LIT_CHARS "\tgit p4 clone --dest=\"$git\" //depot@all &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\t\tgit log --oneline --graph --decorate --all &&\n"> <LIT_CHARS "\t\tgit rev-list master >wc &&\n"> <LIT_CHARS "\t\ttest_line_count = 8 wc\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "import depot, branch detection">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished cleanup_git &&\n"> <LIT_CHARS "\tgit p4 clone --dest=\"$git\" --detect-branches //depot@all &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit log --oneline --graph --decorate --all &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t# 4 main commits\n"> <LIT_CHARS "\t\tgit rev-list master >wc &&\n"> <LIT_CHARS "\t\ttest_line_count = 4 wc &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t# 3 main, 1 integrate, 1 on branch2\n"> <LIT_CHARS "\t\tgit rev-list p4/depot/branch2 >wc &&\n"> <LIT_CHARS "\t\ttest_line_count = 5 wc &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t# no branch1, since no p4 branch created for it\n"> <LIT_CHARS "\t\ttest_must_fail git show-ref p4/depot/branch1\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "import depot, branch detection, branchList branch definition">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished cleanup_git &&\n"> <LIT_CHARS "\ttest_create_repo \"$git\" &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\t\tgit config git-p4.branchList main:branch1 &&\n"> <LIT_CHARS "\t\tgit p4 clone --dest=. --detect-branches //depot@all &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit log --oneline --graph --decorate --all &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t# 4 main commits\n"> <LIT_CHARS "\t\tgit rev-list master >wc &&\n"> <LIT_CHARS "\t\ttest_line_count = 4 wc &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t# 3 main, 1 integrate, 1 on branch2\n"> <LIT_CHARS "\t\tgit rev-list p4/depot/branch2 >wc &&\n"> <LIT_CHARS "\t\ttest_line_count = 5 wc &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\t# 2 main, 1 integrate, 1 on branch1\n"> <LIT_CHARS "\t\tgit rev-list p4/depot/branch1 >wc &&\n"> <LIT_CHARS "\t\ttest_line_count = 4 wc\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "restart p4d">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tkill_p4d &&\n"> <LIT_CHARS "\tstart_p4d\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "add simple p4 branches">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$cli\" &&\n"> <LIT_CHARS "\t\tmkdir branch1 &&\n"> <LIT_CHARS "\t\tcd branch1 &&\n"> <LIT_CHARS "\t\techo file1 >file1 &&\n"> <LIT_CHARS "\t\techo file2 >file2 &&\n"> <LIT_CHARS "\t\tp4 add file1 file2 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"Create branch1\" &&\n"> <LIT_CHARS "\t\tp4 integrate //depot/branch1/... //depot/branch2/... &&\n"> <LIT_CHARS "\t\tp4 submit -d \"Integrate branch2 from branch1\" &&\n"> <LIT_CHARS "\t\techo file3 >file3 &&\n"> <LIT_CHARS "\t\tp4 add file3 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"add file3 in branch1\" &&\n"> <LIT_CHARS "\t\tp4 open file2 &&\n"> <LIT_CHARS "\t\techo update >>file2 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"update file2 in branch1\" &&\n"> <LIT_CHARS "\t\tp4 integrate //depot/branch1/... //depot/branch3/... &&\n"> <LIT_CHARS "\t\tp4 submit -d \"Integrate branch3 from branch1\"\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git p4 clone simple branches">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished cleanup_git &&\n"> <LIT_CHARS "\ttest_create_repo \"$git\" &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\t\tgit config git-p4.branchList branch1:branch2 &&\n"> <LIT_CHARS "\t\tgit config --add git-p4.branchList branch1:branch3 &&\n"> <LIT_CHARS "\t\tgit p4 clone --dest=. --detect-branches //depot@all &&\n"> <LIT_CHARS "\t\tgit log --all --graph --decorate --stat &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch1 &&\n"> <LIT_CHARS "\t\ttest -f file1 &&\n"> <LIT_CHARS "\t\ttest -f file2 &&\n"> <LIT_CHARS "\t\ttest -f file3 &&\n"> <LIT_CHARS "\t\tgrep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch2 &&\n"> <LIT_CHARS "\t\ttest -f file1 &&\n"> <LIT_CHARS "\t\ttest -f file2 &&\n"> <LIT_CHARS "\t\ttest ! -f file3 &&\n"> <LIT_CHARS "\t\t! grep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch3 &&\n"> <LIT_CHARS "\t\ttest -f file1 &&\n"> <LIT_CHARS "\t\ttest -f file2 &&\n"> <LIT_CHARS "\t\ttest -f file3 &&\n"> <LIT_CHARS "\t\tgrep update file2 &&\n"> <LIT_CHARS "\t\tcd \"$cli\" &&\n"> <LIT_CHARS "\t\tcd branch1 &&\n"> <LIT_CHARS "\t\tp4 edit file2 &&\n"> <LIT_CHARS "\t\techo file2_ >>file2 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"update file2 in branch1\" &&\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch1 &&\n"> <LIT_CHARS "\t\tgit p4 rebase &&\n"> <LIT_CHARS "\t\tgrep file2_ file2\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git p4 add complex branches">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$cli\" &&\n"> <LIT_CHARS "\t\tchangelist=$(p4 changes -m1 //depot/... | cut -d\" \" -f2) &&\n"> <LIT_CHARS "\t\tchangelist=$(($changelist - 5)) &&\n"> <LIT_CHARS "\t\tp4 integrate //depot/branch1/...@$changelist //depot/branch4/... &&\n"> <LIT_CHARS "\t\tp4 submit -d \"Integrate branch4 from branch1@${changelist}\" &&\n"> <LIT_CHARS "\t\tchangelist=$(($changelist + 2)) &&\n"> <LIT_CHARS "\t\tp4 integrate //depot/branch1/...@$changelist //depot/branch5/... &&\n"> <LIT_CHARS "\t\tp4 submit -d \"Integrate branch5 from branch1@${changelist}\"\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git p4 clone complex branches">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished cleanup_git &&\n"> <LIT_CHARS "\ttest_create_repo \"$git\" &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\t\tgit config git-p4.branchList branch1:branch2 &&\n"> <LIT_CHARS "\t\tgit config --add git-p4.branchList branch1:branch3 &&\n"> <LIT_CHARS "\t\tgit config --add git-p4.branchList branch1:branch4 &&\n"> <LIT_CHARS "\t\tgit config --add git-p4.branchList branch1:branch5 &&\n"> <LIT_CHARS "\t\tgit p4 clone --dest=. --detect-branches //depot@all &&\n"> <LIT_CHARS "\t\tgit log --all --graph --decorate --stat &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file3 &&\n"> <LIT_CHARS "\t\tgrep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing file3 &&\n"> <LIT_CHARS "\t\t! grep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch3 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file3 &&\n"> <LIT_CHARS "\t\tgrep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch4 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing file3 &&\n"> <LIT_CHARS "\t\t! grep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch5 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file3 &&\n"> <LIT_CHARS "\t\t! grep update file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing .git/git-p4-tmp\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git p4 submit to two branches in a single changelist">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$cli\" &&\n"> <LIT_CHARS "\t\tp4 integrate //depot/branch3/file3 //depot/branch4/file3 &&\n"> <LIT_CHARS "\t\tp4 delete //depot/branch3/file3 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"Move branch3/file3 to branch4/file3\"\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git p4 sync changes to two branches in the same changelist">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished cleanup_git &&\n"> <LIT_CHARS "\ttest_create_repo \"$git\" &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\t\tgit config git-p4.branchList branch1:branch2 &&\n"> <LIT_CHARS "\t\tgit config --add git-p4.branchList branch1:branch3 &&\n"> <LIT_CHARS "\t\tgit config --add git-p4.branchList branch1:branch4 &&\n"> <LIT_CHARS "\t\tgit config --add git-p4.branchList branch1:branch5 &&\n"> <LIT_CHARS "\t\tgit p4 clone --dest=. --detect-branches //depot@all &&\n"> <LIT_CHARS "\t\tgit log --all --graph --decorate --stat &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file3 &&\n"> <LIT_CHARS "\t\tgrep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing file3 &&\n"> <LIT_CHARS "\t\t! grep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch3 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing file3 &&\n"> <LIT_CHARS "\t\tgrep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch4 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file3 &&\n"> <LIT_CHARS "\t\t! grep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch5 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file3 &&\n"> <LIT_CHARS "\t\t! grep update file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing .git/git-p4-tmp\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git p4 file subset branch">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$cli\" &&\n"> <LIT_CHARS "\t\tp4 integrate //depot/branch1/file1 //depot/branch6/file1 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"Integrate file1 alone from branch1 to branch6\"\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "git p4 clone file subset branch">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished cleanup_git &&\n"> <LIT_CHARS "\ttest_create_repo \"$git\" &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\t\tgit config git-p4.branchList branch1:branch2 &&\n"> <LIT_CHARS "\t\tgit config --add git-p4.branchList branch1:branch3 &&\n"> <LIT_CHARS "\t\tgit config --add git-p4.branchList branch1:branch4 &&\n"> <LIT_CHARS "\t\tgit config --add git-p4.branchList branch1:branch5 &&\n"> <LIT_CHARS "\t\tgit config --add git-p4.branchList branch1:branch6 &&\n"> <LIT_CHARS "\t\tgit p4 clone --dest=. --detect-branches //depot@all &&\n"> <LIT_CHARS "\t\tgit log --all --graph --decorate --stat &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file3 &&\n"> <LIT_CHARS "\t\tgrep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing file3 &&\n"> <LIT_CHARS "\t\t! grep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch3 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing file3 &&\n"> <LIT_CHARS "\t\tgrep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch4 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file3 &&\n"> <LIT_CHARS "\t\t! grep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch5 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file3 &&\n"> <LIT_CHARS "\t\t! grep update file2 &&\n"> <LIT_CHARS "\t\tgit reset --hard p4/depot/branch6 &&\n"> <LIT_CHARS "\t\ttest_path_is_file file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing file3\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "use-client-spec detect-branches setup">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\trm -rf \"$cli\" &&\n"> <LIT_CHARS "\tmkdir \"$cli\" &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$cli\" &&\n"> <LIT_CHARS "\t\tclient_view \"//depot/usecs/... //client/...\" &&\n"> <LIT_CHARS "\t\tmkdir b1 &&\n"> <LIT_CHARS "\t\techo b1/b1-file1 >b1/b1-file1 &&\n"> <LIT_CHARS "\t\tp4 add b1/b1-file1 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"b1/b1-file1\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tp4 integrate //depot/usecs/b1/... //depot/usecs/b2/... &&\n"> <LIT_CHARS "\t\tp4 submit -d \"b1 -> b2\" &&\n"> <LIT_CHARS "\t\tp4 branch -i <<-EOF &&\n"> <LIT_CHARS "\t\tBranch: b2\n"> <LIT_CHARS "\t\tView: //depot/usecs/b1/... //depot/usecs/b2/...\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\techo b2/b2-file2 >b2/b2-file2 &&\n"> <LIT_CHARS "\t\tp4 add b2/b2-file2 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"b2/b2-file2\"\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "use-client-spec detect-branches files in top-level">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished cleanup_git &&\n"> <LIT_CHARS "\ttest_create_repo \"$git\" &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\t\tgit p4 sync --detect-branches --use-client-spec //depot/usecs@all &&\n"> <LIT_CHARS "\t\tgit checkout -b master p4/usecs/b1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file b1-file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing b2-file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing b1 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing b2 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tgit checkout -b b2 p4/usecs/b2 &&\n"> <LIT_CHARS "\t\ttest_path_is_file b1-file1 &&\n"> <LIT_CHARS "\t\ttest_path_is_file b2-file2 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing b1 &&\n"> <LIT_CHARS "\t\ttest_path_is_missing b2\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "use-client-spec detect-branches skips branches setup">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$cli\" &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\tp4 integrate //depot/usecs/b1/... //depot/usecs/b3/... &&\n"> <LIT_CHARS "\t\tp4 submit -d \"b1 -> b3\" &&\n"> <LIT_CHARS "\t\tp4 branch -i <<-EOF &&\n"> <LIT_CHARS "\t\tBranch: b3\n"> <LIT_CHARS "\t\tView: //depot/usecs/b1/... //depot/usecs/b3/...\n"> <LIT_CHARS "\t\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t\techo b3/b3-file3 >b3/b3-file3 &&\n"> <LIT_CHARS "\t\tp4 add b3/b3-file3 &&\n"> <LIT_CHARS "\t\tp4 submit -d \"b3/b3-file3\"\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "use-client-spec detect-branches skips branches">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tclient_view \"//depot/usecs/... //client/...\" \\\n"> <LIT_CHARS "\t\t    \"-//depot/usecs/b3/... //client/b3/...\" &&\n"> <LIT_CHARS "\ttest_when_finished cleanup_git &&\n"> <LIT_CHARS "\ttest_create_repo \"$git\" &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd \"$git\" &&\n"> <LIT_CHARS "\t\tgit p4 sync --detect-branches --use-client-spec //depot/usecs@all &&\n"> <LIT_CHARS "\t\ttest_must_fail git rev-parse refs/remotes/p4/usecs/b3\n"> <LIT_CHARS "\t)\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "kill p4d">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tkill_p4d\n">]}  )
  (Com {[LIT_CHARS test_done]}  )
)