[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: Nicolas Goutte <nicolas.goutte_at_extragroup.de>
Date: Wed, 7 Dec 2011 12:01:18 +0100

Am 07.12.2011 um 11:44 schrieb Frederic ROLLAND:

> 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).

TortoiseSVN shows here the difference to the revision previous to the
revision in which the modification is. It is irrelevant if there was a
change in that previous revision or not. (see below).

>
> 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...

The revision exists even if nothing was modified in that exact
revision, see; http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.basic.in-action.revs

Have a nice day!

Nicolas Goutte

extragroup GmbH - Karlsruhe
Waldstr. 49
76133 Karlsruhe
Germany

Geschäftsführer: Lars Busch
Registergericht: Amtsgericht Münster / HRB: 5624
Steuer Nr.: 337/5903/0421 / UstID: DE 204607841

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2891217

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-07 12:01:28 CET

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