3 CONFLICTS=cvs-merge-conflicts
6 if [ -f .mergeinfo ] ; then
7 echo ".mergeinfo exists - clean up first"
11 if [ -f $CONFLICTS ] ; then
12 echo "$CONFLICTS exists - clean up first"
16 if [ $# -lt 2 -o $# -gt 3 ]; then
17 echo "This is phase 1 of merging branches. Usage: $0 parent child [dir]"
22 PARENT=`echo $parent | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"`
24 CHILD=`echo $child | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"`
25 date=`date +%Y%m%d_%H%M`
31 *) parent="b_$parent" ;;
39 if [ "$parent" != "HEAD" -a "`cat CVS/Tag`" != "T$parent" ]; then
40 echo "This script must be run within the $parent branch"
46 cat << EOF > .mergeinfo
57 echo PARENT $PARENT parent $parent CHILD $CHILD child $child date $date
59 # Update your tree to the PARENT branch; HEAD is not really a branch, so you
60 # need to update -A instead of update -r HEAD, or the commit will fail. -p
61 echo -n "Updating to $parent ...."
62 if [ $parent == "HEAD" ]; then
65 $CVS update -r $parent -dP $dir
69 echo -n "Tagging as ${PARENT}_${CHILD}_LAND_PARENT_$date ..."
70 $CVS tag ${PARENT}_${CHILD}_LAND_PARENT_$date $dir
73 echo -n "Create land point on ${child} ${PARENT}_${CHILD}_LAND_CHILD_$date ..."
74 $CVS rtag -r ${child} ${PARENT}_${CHILD}_LAND_CHILD_$date $module $dir
77 echo -n "Preserve old base tag ${CHILD}_BASE as ${CHILD}_BASE_PREV ..."
78 $CVS tag -F -r ${CHILD}_BASE ${CHILD}_BASE_PREV $dir
81 # Apply all of the changes to your local tree:
82 echo -n "Updating as -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date ..."
83 $CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date $dir
86 echo -n "Recording conflicts in $CONFLICTS ..."
87 if $CVS update | grep '^C' > $CONFLICTS; then
88 echo "Conflicts found, fix before committing."
91 echo "No conflicts found"
96 echo "Test, commit and then run land2.sh (no arguments)"