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

Re: BUG - TortoiseSVN 1.5.3 Show Log displays incorrect merge tracking entries

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 04 Sep 2008 20:02:48 +0200

Snakefoot wrote:
> Hi ya
> After having performed the initial merge (See 'TortoiseSVN Blame and
> merge tracking Options' http://groups.google.com/group/tortoisesvn/browse_thread/thread/960fa9a0d256b9cd),
> then a single developer performed a commit to the feature branch, and
> then just merged the single revision to the trunk.
> When doing a Show Log on the trunk, then one can see the revision, and
> when selecting the revision, then one can see the affected files.
> Everything is perfect.
> When enabling "Included merged revisions" then the this commit has 6
> merged revisions attached. These 6 merged revisions are part of the
> initial merge, and they modify files not even related to this commit.

A merge can affect many files, even if they seem not related to the
merge: the svn:mergeinfo property is then modified for those files (not
the actual file content). But they will show up in the log dialog as


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-09-04 20:03:20 CEST

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