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

Problems with diff between trynk and branch

From: M C <mc1607slo_at_gmail.com>
Date: 2006-01-31 10:08:53 CET

Hi,

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!"

Subversion server (1.3) is RedHat7.3 + Apache. Client software is TSVN
(tested with 1.2.6 and 1.3.1).

Regards,

Matjaz
Received on Tue Jan 31 10:09:15 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.