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

Re: Problems with diff between trunk and branch

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-02-06 20:29:53 CET

Matjaz wrote:

> I have found the following isuue regarding branching/tagging a repository:
>
> - i have created a repository
> - checked out the repository using TSVN
> - added standard trunk/branches/tags folders
> - added a file test.txt in trunk and made a few commits
> - created a branch in branches/release-1.x
> - made a local modification to /branches /release-1.x/test.txt
>
> 1. Show log on a file "branches /release-1.x/test.txt":
> - comparison between all versions including a working copy works OK
>
> 2. Show log on a folder "branches/release-1.x":
> - comparison of revisions made on trunk with working copy: I get "File
> Patches" dialog instead "changed files" dialog, instead of list of
> changed files there's "trunk)" - clicking on it shows "Cannot check
> path... file... is incorrect" error
>
> - comparison of two revisions made on trunk: I get "Changed files"
> dialog, when double-clicking a file "PROPFIND request on... path not
> found" error message appears
>
> 3. Show log on a folder "branches":
> - comparison of revisions made on trunk with working copy: I get "File
> Patches" dialog instead "changed files" dialog, with two "test.txt"
> files listed. After double-clicking any of them I get the following
> error: "The file D:\tmp\branches\release- 1.x\test.txt was found twice!?
> This usually happens of you applied a patchfile to the wrong folder!"

I know there are some issues with that feature. But I won't do anything
about that: on the Subversion trunk there's already a new function
implemented which will make the whole unified-diff parsing obsolete and
make this feature work much easier and more reliable.
So I'll wait until we can use that new Subversion function, then it will
work again reliably.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Feb 6 20:56:13 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.