Posts tagged with ankhsvn - page 2

DiffMerge is free, try it with AnkhSVN

SourceGear, known for their Vault source control software, are giving away their three-way diff & merge tool DiffMerge for Windows, Mac and Unix.

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.

DiffExePath

C:\\Program Files\\SourceGear\\DiffMerge\\DiffMerge.exe "%base" "%mine" /t1="Base version" /t2="My version"

MergeExePath

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.

[)amien

AnkhSVN and Visual Studio 2007/2008/Orcas

A newer registry file is available to provide AnkhSVN with Visual Studio 2008 and Vista support in one.

If you are using Visual Studio 2007/2008/Orcas/9.0 you will have found that AnkhSVN 1.01 doesn’t appear in the IDE.

Like many Visual Studio add-ins AnkhSVN should work just fine but won’t appear because the installer does not write an entry for it in the 9.0 section of the registry.

In this case the specific branches are:

  • 32-bit HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\AddIns\Ankh
  • 64-bit HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\AddIns\Ankh

All we need to do is export that section out, change the 8.0 to 9.0 and then run it back into the registry.

This technique should work for any other add-in’s you have that are only appearing in 2005.

If you installed AnkhSVN into the default folder try these registry files I have prepared for 32-bit or 64-bit machines.

[)amien

AnkhSVN 1.0 released (Subversion plug-in for Visual Studio)

Screenshot of AnkhSVN in action!

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!

[)amien

What I’m up to at the moment

The project I’ve been working on professionally for the last two years reaches a milestone this week and so is a great opportunity to take a well-deserved break for a couple of weeks.

I was hoping to head out somewhere as far out as Japan but things are held up in a complicated set of scheduling dependencies and a looming demo to investors.

At home I’m currently working my way through Microsoft .NET Framework 2.0 Windows-Based Client Development Training Kit (nice name there Microsoft) as part of my studies towards exam 70-526. This is a requirement to obtain a Microsoft Certified Professional Developer (Windows Applications) which I’m hoping to add to my resume.

The initial test they provide on the CD-ROM wasn’t too tricky however some of the questions seem rather obscure and irrelevant. This is apparently quite normal for Microsoft exams and does seem to be a little familiar when I think back to my Internet Information Services 4.0 examination I took in 1999 to get my Microsoft Certified Professional certification.

I’m also finishing off a few additional icons for AnkhSVN particularly in the area of the Working Copy Explorer and the Repository Explorer dialogs. Once I can get the Subversion 1.4/APR/zlib dependency libraries etc. installed again then I’ll be able to test and commit those back. I’ll bug Arild to put the 1.4 dependencies up on Tigris for other people wanting to hack around with the source too.

GrinGod and myself have been considering writing a small blogging system in .NET using the SubSonic ORM. I’ve been tempted for a while and today Phil Haack, maintainer of Subtext, dropped the clues that he’s also wanting to switch Subtext to an ORM although would like to do it very slowly.

I, on the other hand, am quite keen for a very lightweight free .NET based ORM that doesn’t provide UI based configuration or skinning abilities instead relying on the developer to get his hands dirty for customization. More of a .NET blogging system for .NET developers who want to integrate it with whatever they’ve rolled for their site.

And it seems we can borrow all sorts of stuff from the Subtext source tree.

[)amien