Changeset View
Changeset View
Standalone View
Standalone View
Tools/scripts/mfh
Show First 20 Lines • Show All 129 Lines • ▼ Show 20 Lines | |||||
"${svn}" up --quiet "${branch}" | "${svn}" up --quiet "${branch}" | ||||
for rev in "$@" | for rev in "$@" | ||||
do | do | ||||
rev=${rev##r} | rev=${rev##r} | ||||
"${svn}" merge -c "r${rev}" ^/head/ "${branch}" | "${svn}" merge -c "r${rev}" ^/head/ "${branch}" | ||||
done | done | ||||
"${svn}" up --quiet "${branch}" | "${svn}" up --quiet "${branch}" | ||||
"${svn}" status "${branch}" | "${svn}" status "${branch}" | ||||
if [ -n "$(command -v colordiff 2>/dev/null)" ]; then | |||||
"${svn}" diff "${branch}" | colordiff | |||||
else | |||||
"${svn}" diff "${branch}" | "${svn}" diff "${branch}" | ||||
fi | |||||
echo "All the merge work was done in ${dir}/${branch}" | echo "All the merge work was done in ${dir}/${branch}" | ||||
ask "Do you want to commit? (no = start a shell)" || ( | ask "Do you want to commit? (no = start a shell)" || ( | ||||
echo "Dropping you to a shell so you can investigate. Exit the shell to resume this script." | echo "Dropping you to a shell so you can investigate. Exit the shell to resume this script." | ||||
cd "${branch}" | cd "${branch}" | ||||
pwd | pwd | ||||
su -m $(id -un) || : | su -m $(id -un) || : | ||||
ask "Do you want to commit now? (no = clean up and abort)" || clean | ask "Do you want to commit now? (no = clean up and abort)" || clean | ||||
) | ) | ||||
Show All 14 Lines |