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`
28 if [ "$parent" != "HEAD" -a "`cat CVS/Tag`" != "T$parent" ]; then
29 echo "This script must be run within the $parent branch"
35 if [ $parent != "HEAD" ]; then
38 if [ $child != "HEAD" ]; then
42 cat << EOF > .mergeinfo
53 echo PARENT $PARENT parent $parent CHILD $CHILD child $child date $date
55 # Update your tree to the PARENT branch; HEAD is not really a branch, so you
56 # need to update -A instead of update -r HEAD, or the commit will fail. -p
57 echo -n "Updating to $parent ...."
58 if [ $parent == "HEAD" ]; then
61 $CVS update -r $parent -dP $dir
65 echo -n "Tagging as ${PARENT}_${CHILD}_LAND_PARENT_$date ..."
66 $CVS tag ${PARENT}_${CHILD}_LAND_PARENT_$date $dir
69 echo -n "Create land point on ${child} ${PARENT}_${CHILD}_LAND_CHILD_$date ..."
70 $CVS rtag -r ${child} ${PARENT}_${CHILD}_LAND_CHILD_$date $module $dir
73 echo -n "Preserve old base tag ${CHILD}_BASE as ${CHILD}_BASE_PREV ..."
74 $CVS tag -F -r ${CHILD}_BASE ${CHILD}_BASE_PREV $dir
77 # Apply all of the changes to your local tree:
78 echo -n "Updating as -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date ..."
79 $CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date $dir
82 echo -n "Recording conflicts in $CONFLICTS ..."
83 if $CVS update | grep '^C' > $CONFLICTS; then
84 echo "Conflicts found, fix before committing."
87 echo "No conflicts found"
92 echo "Test, commit and then run land2.sh (no arguments)"