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

Re: Possible bug shows diff of Merge History

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 06 Apr 2010 21:55:39 +0200

On 06.04.2010 21:36, Cory L wrote:
> I could not find this issue in http://issues.tortoisesvn.net/ and
> other posts so I would like to report the issue.
>
> Basically my SVN server is on 1.6 which supports merges/merge
> histories. I had merged a file from one branch into another. Using
> repo-browser and checking off the show merged revisions box, I was
> able to see the preserved history logs (it shows up in gray text).
> However if I try to view the diff between two of the merged
> revisions, it sometimes does not show any code changes between the
> revisions. Other times it shows the incorrect changes.
>
> If I use my IDE subversion plugin to show the diff between the merged
> revisions, it shows correctly.
>
> Is anyone else experiencing this problem? Can we get this fix for
> tortoise? Thanks.

* what IDE plugin are you using?
* how do you show the diff between revisions? from the log dialog? how?
there are many ways in TSVN to show a diff, we need to know *exactly*
where and how you show the diff
* what do you mean with "it shows the incorrect changes"? What exactly
isn't correct?

Stefan

-- 
        ___
   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=2503600
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-06 21:55:47 CEST

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