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

Re: Bad previous revision shown in diff ( TortoiseMerge )

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Wed, 7 Dec 2011 11:02:28 +0000

On 7 December 2011 10:44, Frederic ROLLAND <f.rolland_at_pellencst.com> wrote:
> When using "Show log" on a file, and selecting a previously commited change in the log (top half), then selecting the file in the changed files list (bottom half) and "Show changes", this opens TortoiseMerge :
>
> - on the right side, the modified content (with the same rev of the commited change entry, say 9154)
>
> - on the left side, the original content of the file : with as rev 9153 (9154-1).
>
> The previous commited change that has modified the same file is rev 8974, propagating the file in rev 8974.
>
> What is the rev 9153? No commited change has updated the file if this rev, only TortoiseMerge speaks about it...

Revisions are repository-wide so every file has a defined state for
every repository revision. Your file changed in r8974 and then stayed
the same until r9154. So r9153 is exactly the same as r8974.

I guess TortoiseMerge could populate the title bars with the specific
revision of the previous change, but it is not always know. If you
diff the last change shown in the log dialog then the only way to find
the revision of the previous change would be to fetch more log
information.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2891218
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-07 12:02:37 CET

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