First and foremost: TortoiseSVN is excellent!
The only dissapointment I've found is in TortoiseMerge. Probably due to
its infancy, the utility is not very usable. For instance, I cannot
manually edit a file while merging. I also cannot use both changes--it's
either one or the other (ie. "mine" or "theirs").
I wanted to suggest using one of the more mature diff/merge programs
already available. One that I like is meld (meld.sourceforge.net). If
you cannot use the source (for licensing issues), perhaps leverage some
ideas. Meld allows me to edit _any_ of the files (using its editor or one
that I specify) and it dynamically updates the diff. It also allows me to
overwrite changes or append/prepend them to the file. And its tabbed-pane
layout is very convenient when working w/ multiple files. Syntax
highlighting is nice too. One really nice feature is that meld shows the
actual difference between two lines--not just that they are different. For
instance:
< abc
> abd
Meld will highlight the 'c' and 'd' differently--makes it very easy to see
what's going on.
I know TortoiseSVN allows me to specify external diff/merge programs, I
just don't know of any good ones for Win32.
Thanks and keep up the great work!
Regards,
Nick G.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 13 18:29:16 2004