Comments on: Branches – Subversion Conversion to Mercurial, Part 2

By: Kiruwa

Kiruwa — Mon, 06 Dec 2010 21:45:55 +0000

@Bryan: some minor variation on this (it will take minutes-hours, depending on repo size) will tell you where your deleted branches are. To pick them up, just do an hg convert -r … so convert the output of this into a largish list of consecutive hg convert calls.

(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”

By: Bryan

Bryan — Fri, 28 May 2010 22:26:56 +0000

Hmm, so I played with this a bunch today and finally realized that hg convert doesn’t find branches that have been svn deleted (as the svn book recommends you do when you are done with a feature branch). My dreams of getting our whole svn history into mercurial are dying.

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?

By: Rock

Rock — Fri, 28 May 2010 01:24:35 +0000

Thanks, Bryan. Good to hear from you. I guess old habits die hard – I still have tacos on every birthday.

By: Bryan

Bryan — Thu, 27 May 2010 23:03:36 +0000

Thanks for writing this! I need to convert a subversion repo to mercurial at work and this pretty much answered all the questions I had about the process.

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.