yiangdea / svnx

Automatically exported from code.google.com/p/svnx
0 stars 0 forks source link

Diff files from the repository doesn't work #122

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago
What steps will reproduce the problem?
1. Open a repository in svnX 
2. Select a file
3. Select 2 revisions that are non-sequential; example 43466 and 41978
4. Click Diff

What is the expected output? What do you see instead?
Should see diff of the two revisions 43466 and 41978. 
Instead I see a diff between 43466 and 43465.

What version of the product are you using? On what operating system?
svnX 1.3
Mac OSX 10.6
svn 1.6.13

Please provide any additional information below.
From the activity log:
/opt/subversion/bin/svn diff --diff-cmd 
/Applications/svnX.app/Contents/Resources/svndiff.sh --extensions filemerge 
--username xxxxx --password xxxxxx --non-interactive -c 43466 
http://svn.acme.com/svnrepo/testfile.js@43466

Original issue reported on code.google.com by blaine.m...@gmail.com on 2 Nov 2010 at 4:02

GoogleCodeExporter commented 8 years ago
I think you are doing it wrong.
This changed in svnX 1.2.
Clicking Diff (cmd-D) now diffs against the PREV revision (no dialog) &
Alt-clicking Diff (cmd-L) diffs against a custom rev (via a sheet).
[Hover the mouse over the Diff toolbar item.]

Original comment by chris...@gmail.com on 2 Nov 2010 at 4:22

GoogleCodeExporter commented 8 years ago
Thanks for the fast response, 2 things:
1) Doesn't seem to work for me. I tried a cmd-L and an alt-click, neither bring 
up sheet.
2) Why have a multiple select list if that doesn't apply to Diff?

Original comment by blaine.m...@gmail.com on 2 Nov 2010 at 4:32

GoogleCodeExporter commented 8 years ago
1. You have to select a target item in the repository browser (bottom of 
window) or an item path (from currently selected log list item) first.
2. To which "multiple select list" are you referring?
The log list is single-select.  The repository browser columns are 
multiple-select which works for Diff-PREV & several other commands.  For 
Diff-custom it uses only the first item in the selection.

Original comment by chris...@gmail.com on 2 Nov 2010 at 4:55

GoogleCodeExporter commented 8 years ago
Ok. I got it to work. I was double clicking a file and then it just shows me 
the revisions for that file in the upper half and just the file in the bottom 
half.  I would then click the revision I was interested in and cmd-L and it 
wouldn't work. If I click the file again at the bottom and cmd-L it works.

So even though the file is selected in the bottom of the window, if it doesn't 
have the focus, cmd-L will not work.

Thanks for your help.

Original comment by blaine.m...@gmail.com on 2 Nov 2010 at 5:33

GoogleCodeExporter commented 8 years ago
Diff-PREV (cmd-D) works on log items, log item paths & repository items so it 
must look at the primary focus.
Diff-custom (cmd-L) doesn't work on log items, but needs to be consistent with 
Diff-PREV.

[Perhaps I should add a way to diff the currently selected log item or log item 
path with the current repo browser revision.
 Though for log items this would be a diff of the entire repo. (So should perhaps require user confirmation.)]

Original comment by chris...@gmail.com on 2 Nov 2010 at 6:18