Posts tagged with subversion - page 2
DiffMerge has a clear interface and supports for file-type specific rule-sets that allow you to decide how to deal with white-space, line-endings, encoding etc.
I’ll be using it instead of my trusty KDiff for a couple of weeks to see how things go.
To use DiffMerge in AnkhSVN head into the Tools > AnkhSVN > Edit the AnkhSVN Configuration menu option and then paste each of the following command-lines into the associated configuration option.
C:\\Program Files\\SourceGear\\DiffMerge\\DiffMerge.exe "%base" "%mine" /t1="Base version" /t2="My version"
C:\\Program Files\\SourceGear\\DiffMerge\\DiffMerge.exe "%base" "%theirs" "%mine" /r="%merged" /t1="Base version" /t2="Their version" /t3="My version"
Alternatively you might want to check out Trevor Green’s instructions on using DiffMerge with TortoiseSVN if you are not yet sold on AnkhSVN and it’s Visual Studio integration.
This presentation is now available on-line.
I will be giving a talk entitled “Change management with Subversion” at the Guernsey Developer User Group later this month.
The talk will start with the reasons for change management and the terminology Subversion uses before delving into a typical work cycle. The AnkhSVN client for Visual Studio and the TortoiseSVN client for Windows Explorer will be demonstrated and various other points covered such as when to branch, when to merge, what server options exist etc.
If you are interested in source control, team collaboration or release management then feel free to come along.
This GDUG meeting takes place on the 24th of May at the Guernsey Training Agency’s office above the Guernsey Post Office in Smith Street. As usual the meeting will start at 6pm and the talk will likely start shortly after that and run to around 30-45 minutes (I’m still finalizing the content).
This location is the venue for the tonight annual general meeting of the Guernsey section of British Computer Society. I believe this particular BCS event is only open to BCS members but if you are a member then this is a gentle reminder. At least 4 of us from the GDUG will be in attendance.
AnkhSVN 1.0 has been released!
If you use Visual Studio 2003 or 2005 and are currently either using the TortoiseSVN shell extension (or Subversion command line) then you would do well to see just how much more productive having source-control available from within the IDE can be.
|Thanks go to Arild and mac||gyver for all their hard work on this great open source project.|
Hope you enjoy my icons too!