#!/bin/bash
 
cd `dirname $0`
base_dir=$(pwd)
 
if [ $# -lt 2 ] ; then
  echo "USAGE: $0 oldBranch newBranch"
  echo " e.g.: $0 http://XXX/api_1 http://XXX/api_2 merge.log"
  exit 1
fi
 
function ask_Y_N {
  echo -e "\e[31;40;1mCheck Again! Go Next? (Y/N) (default: N)\e[m"
  read dorm
  dorm=${dorm:=N}
  if [ $dorm != Y ] && [ $dorm != y ]; then
    echo "==>Exit."
    exit 0
  fi
}
 
oldBranch=$1
newBranch=$2
echo -e "oldBranch is: \e[36;40;4m$oldBranch\e[m"
echo -e "newBranch is: \e[36;40;4m$newBranch\e[m"
echo "Meger oldBranch to the newBranch."
ask_Y_N
 
date_str=$(date +%Y-%m-%d_%H:%M:%S)
#echo $date_str $base_dir $1 $2 $3
 
echo -e "\e[32;40;1m1. svn co newBranch.\e[m"
newBranchDir=$base_dir/$(date +%s)_new
svn co $newBranch $newBranchDir
 
echo -e "\e[32;40;1m2. find the oldBranch begin version.\e[m"
bengin_ver=$(svn log --stop-on-copy $oldBranch |grep 'r[0-9]* |' | tail -n 1 | awk -F"[ r|]" '{print $2}')
echo "Begin version: $bengin_ver"
svn log -r $bengin_ver $oldBranch
 
echo -e "\e[32;40;1m3. svn merge --dry-run -r $bengin_ver:HEAD\e[m"
svn merge --dry-run -r $bengin_ver:HEAD $oldBranch $newBranchDir
 
echo -e "\e[32;40;1m4. svn merge --ignore-ancestry -r $bengin_ver:HEAD\e[m"
ask_Y_N
cd $newBranchDir
svn merge --ignore-ancestry -r $bengin_ver:HEAD $oldBranch .
 
echo -e "\e[32;40;1m==> Done. Please do 'svn commit' yourself later!\e[m"
echo "cd $newBranchDir"
echo "svn ci -m 'merge from $oldBranch Details:\\"