Lines Matching refs:br2
8992 dotest multibranch-5 "${testcvs} tag -b br2" \
9000 dotest multibranch-8 "${testcvs} -q update -r br2" '[UP] file1'
9001 echo br2 adds a line >>file1
9002 dotest multibranch-9 "${testcvs} -q ci -m modify-on-br2" \
9007 dotest multibranch-12 "${testcvs} -q update -r br2" '[UP] file1'
9009 br2 adds a line'
9020 br2: 1\.1\.0\.4
9033 modify-on-br2
9953 # * merge changes from branch 'branch' into branch 'br2'.
9971 # \->br1 \->br2
10309 dotest join-26 "${testcvs} -q tag -b br2" \
10314 dotest join-27 "${testcvs} -q update -r br2" ""
10339 # updates to br2 and merges in the same step - and there was a bug
10574 # add file2, which will exist on trunk and br2 but not br1.
10586 dotest join3-10 "${testcvs} -q tag -b br2" "T file1
10589 # Before we actually have any revision on br2, let's try a join
10592 dotest join3-12 "${testcvs} -q update -j br2" \
10608 # OK, we'll try the same thing with a revision on br2.
10609 dotest join3-14 "${testcvs} -q update -r br2 file1" \
10612 echo 'br2:line1' >>file1
10617 # OK, now we can join br2 to br1
10623 dotest join3-17 "${testcvs} -q update -j br2 file1" \
10635 br2:line1
25433 dotest tagdate-6 "${testcvs} -q tag -b br2" "T file1"
25441 # any revisions. First the case where br2 doesn't have any
25444 dotest tagdate-9 "${testcvs} -q update -r br2" "[UP] file1"
25445 echo br2-1 >file1
25446 dotest tagdate-10 "${testcvs} -q ci -m modify-on-br2" \
25451 # Then the case where br2 does have revisions:
25459 echo br2-2 >file1
25460 dotest tagdate-13 "${testcvs} -q ci -m modify-2-on-br2" \
25477 -br2-1
25478 ${PLUS}br2-2"
25484 dotest tagdate-13e "cat file1" "br2-1"
25496 "$testcvs -q export -r br2 -D'$date_T3' first-dir" \
25498 dotest tagdate-14b "cat first-dir/file1" "br2-1"
25502 dotest tagdate-15b "cat second-dir/file1" "br2-1"
25510 1\.1\.4\.1 ($username8 *[0-9a-zA-Z-]*): br2-1"
25516 1\.1\.4\.2 ($username8 *[0-9a-zA-Z-]*): br2-2"
25518 # Now check to see what happens when we add files to br2 and trunk
25519 echo br2-1 > file3
25521 "${SPROG} add: scheduling file \`file3' for addition on branch \`br2'
25548 echo br2-1 > file2
25550 "${SPROG} add: scheduling file \`file2' for addition on branch \`br2'
25562 # br2 branch created
25564 # T3 1.1.4.1 br2 first-dir/file1 committed "br2-1"
25566 # T4 1.1.4.2 br2 first-dir/file1 committed "br2-2"
25568 # T6 1.1.2.1 br2 first-dir/file3 committed "br2-1"
25571 # T8 1.2.2.1 br2 first-dir/file2 dead
25572 # T9 1.2.2.2 br2 first-dir/file2 committed "br2-1"
25590 dotest tagdate-26-br2-t1 \
25591 "${testcvs} co -r br2 -D'$date_T1' -d first-dir-br2-t1 first-dir" \
25592 "${SPROG} checkout: Updating first-dir-br2-t1
25593 U first-dir-br2-t1/file1"
25598 dotest tagdate-26-br2-t2 \
25599 "${testcvs} co -r br2 -D'$date_T2' -d first-dir-br2-t2 first-dir" \
25600 "${SPROG} checkout: Updating first-dir-br2-t2
25601 U first-dir-br2-t2/file1"
25602 dotest tagdate-26-br2-t3 \
25603 "${testcvs} co -r br2 -D'$date_T3' -d first-dir-br2-t3 first-dir" \
25604 "${SPROG} checkout: Updating first-dir-br2-t3
25605 U first-dir-br2-t3/file1"
25606 dotest tagdate-26-br2-t4 \
25607 "${testcvs} co -r br2 -D'$date_T4' -d first-dir-br2-t4 first-dir" \
25608 "${SPROG} checkout: Updating first-dir-br2-t4
25609 U first-dir-br2-t4/file1"
25610 dotest tagdate-26-br2-t6 \
25611 "${testcvs} co -r br2 -D'$date_T6' -d first-dir-br2-t6 first-dir" \
25612 "${SPROG} checkout: Updating first-dir-br2-t6
25613 U first-dir-br2-t6/file1
25614 U first-dir-br2-t6/file3"
25620 dotest tagdate-26-br2-t7 \
25621 "${testcvs} co -r br2 -D'$date_T7' -d first-dir-br2-t7 first-dir" \
25622 "${SPROG} checkout: Updating first-dir-br2-t7
25623 U first-dir-br2-t7/file1
25624 U first-dir-br2-t7/file3"
25630 dotest tagdate-26-br2-t8 \
25631 "${testcvs} co -r br2 -D'$date_T8' -d first-dir-br2-t8 first-dir" \
25632 "${SPROG} checkout: Updating first-dir-br2-t8
25633 U first-dir-br2-t8/file1
25634 U first-dir-br2-t8/file3"
25635 dotest tagdate-26-br2-t9 \
25636 "${testcvs} co -r br2 -D'$date_T9' -d first-dir-br2-t9 first-dir" \
25637 "${SPROG} checkout: Updating first-dir-br2-t9
25638 U first-dir-br2-t9/file1
25639 U first-dir-br2-t9/file2
25640 U first-dir-br2-t9/file3"
25653 dotest tagdate-27-br2-t1 \
25654 "${testcvs} status first-dir-br2-t1" \
25655 "${SPROG} status: Examining first-dir-br2-t1
25662 Sticky Tag: br2 (branch: 1\.1\.4)
25677 dotest tagdate-27-br2-t2 \
25678 "${testcvs} status first-dir-br2-t2" \
25679 "${SPROG} status: Examining first-dir-br2-t2
25686 Sticky Tag: br2 (branch: 1\.1\.4)
25689 dotest tagdate-27-br2-t3 \
25690 "${testcvs} status first-dir-br2-t3" \
25691 "${SPROG} status: Examining first-dir-br2-t3
25698 Sticky Tag: br2 (branch: 1\.1\.4)
25701 dotest tagdate-27-br2-t4 \
25702 "${testcvs} status first-dir-br2-t4" \
25703 "${SPROG} status: Examining first-dir-br2-t4
25710 Sticky Tag: br2 (branch: 1\.1\.4)
25713 dotest tagdate-27-br2-t6 \
25714 "${testcvs} status first-dir-br2-t6" \
25715 "${SPROG} status: Examining first-dir-br2-t6
25722 Sticky Tag: br2 (branch: 1\.1\.4)
25732 Sticky Tag: br2 (branch: 1\.1\.2)
25757 dotest tagdate-27-br2-t7 \
25758 "${testcvs} status first-dir-br2-t7" \
25759 "${SPROG} status: Examining first-dir-br2-t7
25766 Sticky Tag: br2 (branch: 1\.1\.4)
25776 Sticky Tag: br2 (branch: 1\.1\.2)
25801 dotest tagdate-27-br2-t8 \
25802 "${testcvs} status first-dir-br2-t8" \
25803 "${SPROG} status: Examining first-dir-br2-t8
25810 Sticky Tag: br2 (branch: 1\.1\.4)
25820 Sticky Tag: br2 (branch: 1\.1\.2)
25823 dotest tagdate-27-br2-t9 \
25824 "${testcvs} status first-dir-br2-t9" \
25825 "${SPROG} status: Examining first-dir-br2-t9
25832 Sticky Tag: br2 (branch: 1\.1\.4)
25842 Sticky Tag: br2 (branch: 1\.2\.2)
25852 Sticky Tag: br2 (branch: 1\.1\.2)
25858 dotest tagdate-28-br2-t1 'cat first-dir-br2-t1/file1' 'trunk-1'
25860 dotest tagdate-28-br2-t2 'cat first-dir-br2-t2/file1' 'trunk-1'
25861 dotest tagdate-28-br2-t3 'cat first-dir-br2-t3/file1' 'br2-1'
25862 dotest tagdate-28-br2-t4 'cat first-dir-br2-t4/file1' 'br2-2'
25863 dotest tagdate-28-br2-t6a 'cat first-dir-br2-t6/file1' "br2-2"
25864 dotest tagdate-28-br2-t6b 'cat first-dir-br2-t6/file3' "br2-1"
25867 dotest tagdate-28-br2-t7a 'cat first-dir-br2-t7/file1' "br2-2"
25868 dotest tagdate-28-br2-t7b 'cat first-dir-br2-t7/file3' "br2-1"
25871 dotest tagdate-28-br2-t8a 'cat first-dir-br2-t8/file1' "br2-2"
25872 dotest tagdate-28-br2-t8c 'cat first-dir-br2-t8/file3' "br2-1"
25873 dotest tagdate-28-br2-t9a 'cat first-dir-br2-t9/file1' "br2-2"
25874 dotest tagdate-28-br2-t9b 'cat first-dir-br2-t9/file2' "br2-1"
25875 dotest tagdate-28-br2-t9c 'cat first-dir-br2-t9/file3' "br2-1"
26790 br2 (branch: 1\.1\.2)
26875 br2:1\.1\.0\.2
27020 br2: 1\.1\.0\.2