This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 230594 - Subversion "diff between branches" doesn't work
Summary: Subversion "diff between branches" doesn't work
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Subversion (show other bugs)
Version: 7.4
Hardware: PC Linux
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-05-31 16:06 UTC by gholmer
Modified: 2013-06-05 09:35 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments
screenshot (41.34 KB, image/png)
2013-05-31 16:07 UTC, gholmer
Details
NetBeans log file (361.28 KB, text/plain)
2013-05-31 16:08 UTC, gholmer
Details

Note You need to log in before you can comment on or make changes to this bug.
Description gholmer 2013-05-31 16:06:35 UTC
Steps to reproduce:

1) Right-click project in project pane. Project is on a branch whose URL is http://miranda/svn/weycogroup/branches/WEYCOGROUP-WEB-ENUM.
2) Select Subversion / Diff / Diff To... and enter "weycogroup/trunk" for repository folder, revision "HEAD".
3) Dialog appears saying "http://miranda/svn/weycogroup/weycogroup@HEAD:  (Not a valid URL)". The URL should be "http://miranda/svn/weycogroup/trunk@HEAD".

Screeenshot attached.
Comment 1 gholmer 2013-05-31 16:07:17 UTC
Created attachment 135185 [details]
screenshot
Comment 2 gholmer 2013-05-31 16:08:01 UTC
Created attachment 135186 [details]
NetBeans log file
Comment 3 Ondrej Vrabec 2013-05-31 16:10:07 UTC
please add also the content of the output window (it should contain some more info about the failed commands).
I agree that it works somehow strange and not for all cases but i haven't reproduced this one exactly.
Comment 4 gholmer 2013-05-31 16:24:13 UTC
There is nothing in the output window except this:

==[IDE]== May 31, 2013 11:21:44 AM Updating Statuses...
==[IDE]== May 31, 2013 11:21:44 AM Updating Statuses... finished.

The versioning output window is completely empty.

I should mention that we're using Subversion 1.6 (CLI, not SVNKit or JavaHL).
Comment 5 Ondrej Vrabec 2013-05-31 18:21:35 UTC
1) won't work with cli, you are right. But the main problem is:
2) cannot diff .../project/trunk to .../project/branches/branch. For now only folders with the same name can be diffed (../trunk/project to .../branch/project). Stupid, i know, but i haven't realize that until now, thanks for noticing.

Can you:
1) switch to svnkit
2) diff something with same names, e.g. project/trunk/src to project/branches/branch/src ?
Comment 6 Ondrej Vrabec 2013-06-03 12:14:50 UTC
fix: http://hg.netbeans.org/core-main/rev/36383506b713
Comment 7 Quality Engineering 2013-06-05 09:35:29 UTC
Integrated into 'main-golden', will be available in build *201306050626* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main-golden/rev/36383506b713
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #230594 - Subversion "diff between branches" doesn't work