On Thu, May 24, 2012 at 2:08 AM, Pete Wyckoff <pw@xxxxxxxx> wrote: > vitor.hda@xxxxxxxxx wrote on Wed, 23 May 2012 00:38 +0100: >> It is possible to modify two different branches in P4 in a single >> changelist. git-p4 correctly detects this and commits the relevant >> changes to the different branches separately. This test proves that and >> avoid future regressions in this behavior. >> >> Signed-off-by: Vitor Antunes <vitor.hda@xxxxxxxxx> >> --- >> t/t9801-git-p4-branch.sh | 54 ++++++++++++++++++++++++++++++++++++++++++++++ >> 1 files changed, 54 insertions(+), 0 deletions(-) >> >> diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh >> index 2859256..89d8c59 100755 >> --- a/t/t9801-git-p4-branch.sh >> +++ b/t/t9801-git-p4-branch.sh >> @@ -306,6 +306,60 @@ test_expect_success 'git p4 clone complex branches' ' >> ) >> ' >> >> +# Move branch3/file3 to branch4/file3 in a single changelist >> +test_expect_success 'git p4 submit to two branches in a single changelist' ' >> + test_when_finished cleanup_git && >> + test_create_repo "$git" && > > You can skip the git bits here. This is just setup for the next > test. What about the parentheses in the next line, is it necessary? Or can I simply remove that pair of parentheses and unindent the code in between? Thanks, Vitor > Ack everything else. Nice to have the extra tests. > > -- Pete > >> + ( >> + cd "$cli" && >> + p4 integrate //depot/branch3/file3 //depot/branch4/file3 && >> + p4 delete //depot/branch3/file3 && >> + p4 submit -d "Move branch3/file3 to branch4/file3" >> + ) >> +' >> + >> +# Confirm that changes to two branches done in a single changelist >> +# are correctly imported by git p4 >> +test_expect_success 'git p4 sync changes to two branches in the same changelist' ' >> + test_when_finished cleanup_git && >> + test_create_repo "$git" && >> + ( >> + cd "$git" && >> + git config git-p4.branchList branch1:branch2 && >> + git config --add git-p4.branchList branch1:branch3 && >> + git config --add git-p4.branchList branch1:branch4 && >> + git config --add git-p4.branchList branch1:branch5 && >> + git p4 clone --dest=. --detect-branches //depot@all && >> + git log --all --graph --decorate --stat && >> + git reset --hard p4/depot/branch1 && >> + test_path_is_file file1 && >> + test_path_is_file file2 && >> + test_path_is_file file3 && >> + grep update file2 && >> + git reset --hard p4/depot/branch2 && >> + test_path_is_file file1 && >> + test_path_is_file file2 && >> + test_path_is_missing file3 && >> + ! grep update file2 && >> + git reset --hard p4/depot/branch3 && >> + test_path_is_file file1 && >> + test_path_is_file file2 && >> + test_path_is_missing file3 && >> + grep update file2 && >> + git reset --hard p4/depot/branch4 && >> + test_path_is_file file1 && >> + test_path_is_file file2 && >> + test_path_is_file file3 && >> + ! grep update file2 && >> + git reset --hard p4/depot/branch5 && >> + test_path_is_file file1 && >> + test_path_is_file file2 && >> + test_path_is_file file3 && >> + ! grep update file2 && >> + test_path_is_missing .git/git-p4-tmp >> + ) >> +' >> + >> test_expect_success 'kill p4d' ' >> kill_p4d >> ' >> -- >> 1.7.7.rc2.14.g5e044.dirty >> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html