Re[2]: [TSVN] TortoiseMerge + keeping both changes

Friday, June 25, 2004, 9:43:51 AM, you wrote:

SK> Peter Mounce wrote:

SK> Select the conflicted lines in the bottom view, right-click and have a
SK> look at the context menu. I think you'll find there what you need.

Thanks; precisely what I was after.

SK> What's wrong with the changelog?
SK> http://svn.collab.net/repos/tortoisesvn/trunk/src/Changelog.txt

Nothing whatsoever is wrong with the changelog, *except* for the fact
that it's not linked directly from the status page, which is where I
was looking.

My thought process was something like "I wonder if it does this;
didn't find it in the program help; didn't find it in the help on the
website; wasn't it mentioned on the mailing list? didn't find the
mailing list message with it; ask".

SK> I write there the changes I make. Ok, not with date and revision but still.
SK> And if you want a detailed log (see the hint?) of what I already did and
SK> when, just use TSVN to show the log of
SK> http://svn.collab.net/repos/tortoisesvn/trunk/

I didn't think to, sorry. Even if I had, that's less useful than the
changelog.txt you linked to, because (as far as I know?) the log
window is not searchable.

Feature request: please make the show-log dialog searchable! :-) I
guess both in terms of log comment-searching and files-modified.

Regards
Pete

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jun 25 12:04:26 2004