Peter Mounce wrote:
> Hi; I think I remember seeing someone on the list ask for TMerge to
> make it possible to keep changes from *both* files when there is a
> conflict, and even pick the order in which the changes are applied. I
> even think I remember that change being implemented. I've had a brief
> search, but didn't find whether that change is in the version (1200)
> of TSVN that I'm using...?
> If it is, how do I do it from TMerge? I'm in three-panel view, invoked
> from double-clicking a conflict in an update dialog.
Select the conflicted lines in the bottom view, right-click and have a
look at the context menu. I think you'll find there what you need.
> While I'm here, can I suggest (beg for) something? Every time
> SteveKing says the glorious, magical words "fixed in revision xyz",
> can he echo that to a page on the website that says revision number,
> thing fixed, date, please? My failed search of the list searched
> bodies for "fixed in", and as I said, came up wanting. It also only
> seemed to search pre-2004, but that's another thing.
What's wrong with the changelog?
http://svn.collab.net/repos/tortoisesvn/trunk/src/Changelog.txt
I write there the changes I make. Ok, not with date and revision but still.
And if you want a detailed log (see the hint?) of what I already did and
when, just use TSVN to show the log of
http://svn.collab.net/repos/tortoisesvn/trunk/
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jun 25 11:44:27 2004