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

Re: Comparing branches

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 19 May 2009 17:54:41 +0200

webpost_at_tigris.org wrote:
> I have two branches, in the same repository. The URls are something like:
> /Branches/Release/4.0
> and /Branches/Tasks/FeatureX
>
> FeatureX is a copy of Branches/Release/4.0 and was used to implement feature X
> (which modified files and created a new directory containing a few new files)
>
> I have merged the latest from 4.0 into FeatureX, and that appeared to be Ok.
> But now, to verify the merge, I want to compare those 2 branches (I expect to
> see only the changes made for feature X). But I don't understand what I am
> seeing!
> I used two ways to do the same comparison, and see different results...
>
> first way: I open the revision graph, select the head of Release/4.0 first,
> then the head of FeatureX and I choose compare HEAD revisions in the popup
> menu. I get a list of changed files, in which I can see one added folder and
> 5 new files in that folder. That seems correct.
>
> second way: same as above, but I select the head of featureX first, then the
> head of release/4.0. In that case, the list of changed files shows me only
> the folder (as deleted, since the compare is done the other way around; if I
> hit the "switch comparison left <-> right" button, the folder shows as added,
> but its files are still not listed). Why don't I see the files in that
> folder?
>
> Also, in both cases, in the list of changed files, there is at least one
> unexpected file(it was previously merged and I don't expect to see it as
> changed in that comparison). When I double click on that file to see the
> differences, there are no differences! So why is it listed? (there maybe other
> files in that case, I have not looked at them all)
>
> I have tried to do the same diffs from the repo browser (using "mark for
> comparison" and "compare URLs"), and I see the same behavior (depending on
> which branch I first mark for compare), excepted that no matter the order I do the
> compare, I don't see the unexpected file that I see when comparing from the
> revision graph
>
> Does anybody have an idea about what is going on here? I was thinking about
> trying the same thing using svn client, but I do not know what commands
> tortoise generates in all the scenario above (and I am not familiar with svn
> client)

Try
$ svn diff url1_at_rev url2_at_rev --summarize
and
$ svn diff url2_at_rev url1_at_rev --summarize

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=2314521
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-05-19 17:55:39 CEST

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