Thanks for the feedback.
> 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 must be missing something. Where is the bottom view? I see a small
pane on the bottom
(~2 rows) but I don't see anything in it. I click on the change, cursor
to the next one, but I don't
see anything. The manual doesn't say anything about what you describe.
> 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.
Yes, the UI libraries are different, unless you're using a cross-platform
library like WxWindows or QT or course. Perhaps just leverage ideas then.
I think usability is key.
> The Subversion diff library doesn't allow a diff inside a line. It has
> the diff chunks hardcoded to newlines.
Meld can do this regardless if the files are from CVS, Subversion, or not
version controlled at all. I suspect is uses GNU diff to determine the
particular differences after CVS or Subversion give it the line (ie. a
2-step process).
> Check out the FAQ. There are some diff programs mentioned in there.
Ok, thanks.
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 20:11:04 2004