arnaud wrote:
> I did more test and I seems the problem is on my side. However, I do not
> figure out why.
>
> Here is what I did.
> I am working on the BitTorrent code. To check each modification between
> releases, I have created my own local SVN repository. Each time there is
> a new release, I create using the repository browser a new branch. Then
> I checkout this branch, which is empty, I unzip the source code in the
> fresh checked out directory, then I add and commit. This way I have in
> my repository each new release and I can compare them.
>
> If I look at my repository I see that each branch as a different
> revision that is strictly higher than 0.
>
> But, when I compare some revisions, it considers some files with a
> revision 0. In the repository browser, these files do not appear with
> a 0 as revision number in any of both compared branches.
> Take as an example a comparison between branch 4.1.6 and 4.1.7
> I got, for instance, in the unified diff the following:
> <cut>
> Index: installer.nsi
> ===================================================================
> --- installer.nsi (.../4.1.7) (revision 78)
> +++ installer.nsi (.../4.1.6) (revision 78)
> @@ -1,566 +0,0 @@
> <cut the diff>
>
> Index: installer.nsi
> ===================================================================
> --- installer.nsi (.../4.1.7) (revision 0)
> +++ installer.nsi (.../4.1.6) (revision 78)
> @@ -0,0 +1,522 @@
> <cut the diff>
Strange indeed. Why is the installer.nsi listed twice? (twice with
"Index:" line).
If I had to guess, it's because you didn't create the branches from
/trunk due to a copy but you created them 'fresh'. So the files you're
diffing don't have a common root but are completely unrelated (in terms
of Subversion). There's a flag to force Subversion to treat files as
related when diffing, but then the unified diff isn't really parsable
anymore (believe me, I tried!).
I guess you have to wait a few month until Subversion 1.4 is out - it
will have a special "diff" function for UI clients which TSVN will use
to get the list of changed files. So no need for parsing unified diffs
anymore - but for now, we have to live with some bad effects due to
parsing the unified diff.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Nov 24 20:25:17 2005