Posts tagged with ankhsvn - 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.
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!
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.
Christopher Bennage wrote about his development tool set-up and encouraged others to do the same so here’s my current set-up.
- Visual Studio 2005 – IDE of preference despite it’s sluggish behavior
- SQL Server 2005 Management Studio – Took getting used to but it’s an improvement on 2000’s Enterprise Manager
- AnkhSVN – Subversion support inside Visual Studio 2005
- .NET Reflector – Searching .NET API or to find out what it’s doing
- Web Application Projects – Stop using VS’s web sites and start using web applications!
- Web Deployment Projects – Deploy to dev, test or live servers as easily as building a project
Not quite daily
- CodeSmith – Need to get to grips with v4 to build our whole database layer in one hit
- Trac – Bug tracking, milestones & wiki with integrated support for Subversion
- TortoiseSVN – Check-in/out of non-project items (e.g. art assets)
- Web Developer Extension – Trying CSS changes on-the-fly, validating pages etc. from Firefox
- Firebug – Examining pages, the page DOM etc. from Firefox
- KDiff – Excellent 3-way diff tool that works great with AnkhSVN
- Subtext – Blogging system running here
- Visual C# Express and XNA – Messing with 3D graphics, controllers and pixel shaders
- Ogre – Steve’s object-oriented 3D engine
- Xcode and Cocoa – Still quite alien with it’s message-based calling mechanism but obviously powerful
Keeping an eye on
- Eclipse – IDE for developing Java (C++ and C# support in various stages too)
- Ruby on Rails – Interesting RAD approach to web development – Apple also supporting on Mac OS X 10.5
- Sandcastle – Microsoft’s documentation tool that already seems to have had an impact on NDoc
- SubSonic – Build-provider that generates an ORM on the fly and provides automatic developer-only db editing pages
Not used lately, still installed
- Delphi 5/6 – Borland’s great RAD tool for non-.NET development, later versions support .NET too
- JBuilder – Java development although I’d probably move to Eclipse
- Visual Studio 2003 – Still required for the odd .NET 1.1 application/testing