(just indent after while and if’s… outdent the fi’s and done)

#!/bin/bash

repo=”$1″
end=${2:-”0″}

branch_sed=”s|^ D /prj/branches/||”

tip=`svn info “$repo” | grep “Last Changed Rev:” | sed ’s/.* //’`
echo “Scanning from $tip”
while [[ $tip -gt $end ]]; do
log=`svn log -l1 -v “$repo”@$tip`
if [[ `echo "$log" | grep -c "^ D"` -ge 1 ]]; then
deletes=`echo “$log” | grep “^ D” |sed “$branch_sed”`
if [[ `echo $deletes | grep -c "/"` -eq 0 ]]; then
rev=`echo “$log” | grep -o “^r[0-9]*”`
echo -e “\n—-Branches Deleted at rev $rev\n”"$deletes”
tip=`echo $rev | sed ’s/r//’`
fi
fi
echo -n “.”
let tip=tip-1
done
echo “Done”

Manually creating a splicemap entry for each merge was looking to be a pretty tedious chore. When convert doesn’t even know about one of the revisions you specified because it’s on a branch that got deleted, it gets even harder.

Maybe I missed something though?

Also, congrats on the new job at Fog Creek! I still remember hanging out at your house when we were about 8 years old, your cool computer with the compact cassette tape drive, and eating tacos at your birthday party. Good times.