[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [TSVN] Re: SV: Re: Two suggestions

From: Nathan Creek <nathan_at_adweb.com.au>
Date: 2004-10-25 03:50:50 CEST

SteveKing wrote:
> Simon Large wrote:
>
>> "SteveKing" wrote:
>>
>>> Done in revision 1855:
>>> you can right-click on an updated file (folder don't show the context
>>> menu) and choose "compare with working copy" in the progress dialog.
>>
>> Compare what with working copy? The working copy is the same as
>> repo/HEAD after the update.
>
> The revision before the update is fetched and then compared with the
> working copy (the last-committed-rev).

Thanks for the speedy reponse Stefan.

I've just downloaded nightly 1857 to try it out and it works well, but
not exactly how i had expected. I think I'm more after a Show
Differences option than Compare with Working Copy option.

Here are some thoughts.

1. Add a Show Differences right click option that only shows the changes
between revisions (See below for an explanation).
2. Now that there is a right click context menu include Resolve
Conflicts for conflicted files.
3. Add an extra column to the update dialog that shows the previous
revision number of updated files. This would be most useful for when i
want to copy the contents of the update dialog into a text file for
future reference.

Explanation for point 1
~~~~~~~~~~~~~~~~~~~~~~~
If my working copy file.txt is based on r11 and don't have any local
modifications and i update to file.txt r12 then it shows the differences
between r11 and my working copy. That's fine because my working copy is
the same as r12, so it's the equivalent to comparing r11 and r12.

If my working copy file.txt is based on r11 and has a lot of local
modifications and i update to file.txt r12 and there are no conflicts,
then it shows the differences between r11 and my merged version of r12.
That means that i'm looking at both the differences between r11 and r12
amoungst and the changes i made to r11.
A Show Differences option that just compares r11 and r12 would allow me
to see only the changes that were made to file.txt by doing the update.

If my working copy file.txt is based on r11 and has a lot of local
modifications and i update to file.txt r12 and there are conflicts, then
it shows the differences between r11 and my conflicted local copy.
Needless to say, it's not easy to tell what changed between r11 and r12
from this.

Nathan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Oct 25 15:49:08 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.