5 if [ -f .mergeinfo ] ; then
6 echo ".mergeinfo exists - clean up first"
10 if [ -f merge-conflicts ] ; then
11 echo "cvs-merge-conflicts exists - clean up first"
16 echo "This is phase 1 of merging branches. Usage: $0 parent child"
21 PARENT=`echo $parent | tr '[a-z]' '[A-Z]'`
23 CHILD=`echo $child | tr '[a-z]' '[A-Z]'`
24 date=`date +%Y%m%d_%H%M`
27 if [ $parent != "HEAD" ]; then
30 if [ $child != "HEAD" ]; then
34 cat << EOF > .mergeinfo
43 echo PARENT $PARENT parent $parent CHILD $CHILD child $child date $date
45 echo -n "tagging $parent as ${PARENT}_${CHILD}_UPDATE_PARENT_$date ...."
46 $CVS rtag -r $parent ${PARENT}_${CHILD}_UPDATE_PARENT_$date $module
48 echo -n "tagging $child as ${PARENT}_${CHILD}_UPDATE_CHILD_$date ...."
49 $CVS rtag -r $child ${PARENT}_${CHILD}_UPDATE_CHILD_$date $module
51 echo "Updating: -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_UPDATE_PARENT_$date ...."
52 $CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_UPDATE_PARENT_$date -dP
54 echo -n "Recording conflicts in cvs-merge-conflicts ..."
55 if $CVS update | grep '^C' > cvs-merge-conflicts; then
56 echo "Conflicts found, fix before committing."
57 cat cvs-merge-conflicts
59 echo "No conflicts found"
61 echo "Test, commit and then run merge2.sh (no arguments)"