Re: [TSVN] Diff/Merge utility suggestion

Nick_Gianakas@sybari.com wrote:

> 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").

Sure you can keep both changes. In the bottom view, you can select
"yours before theirs" and "theirs before yours" as well as yours and
theirs alone. (On conflicted lines only, of course).

> 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

Using the source of a Linux project on windows is so hard to do that
you'll be much faster if you just write everything from scratch again.
The Windows UI stuff is completely different than any Linux UI library I
know of.

[snip]
> Meld will highlight the 'c' and 'd' differently--makes it very easy to see
> what's going on.

The Subversion diff library doesn't allow a diff inside a line. It has
the diff chunks hardcoded to newlines.

> I know TortoiseSVN allows me to specify external diff/merge programs, I
> just don't know of any good ones for Win32.

Check out the FAQ. There are some diff programs mentioned in there.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 13 19:09:26 2004