Diff to newer version than checked out

5 views
Skip to first unread message

skibster205

unread,
Jan 26, 2011, 8:47:52 PM1/26/11
to svnX
I'm wondering if it is possible to view to a newer version or the head
when doing diff.

Scenario:
1. User A checks out latest version (which is r 8 at the time).

2. User B commits code to repos for file XYZ (latest version is now r
9)

3. User A edits file XYZ from their r 8 checked out copy.

4. User A performs a Diff with Alt-Click to compare to other
revisions, but can only see revisions from 8 and below, they can't see
r 9 or the head on the server.

Thanks.
Jim

chris

unread,
Jan 27, 2011, 11:43:56 PM1/27/11
to svnX
Hello Jim,

On Jan 27, 1:47 am, skibster205 <jaskib...@gmail.com> wrote:
> I'm wondering if it is possible to view to a newer version or the head
> when doing diff.

It's not currently possible to do this directly in svnX.

However, you can quite easily drag any revision of any file out of a
Repository window into the Finder.
From there you can drag it to FileMerge’s window along with your
working copy file.
Alternatively, if you are using TextWrangler (or similar) you can drag
from a Repository window straight to TextWrangler’s Dock icon, then
drag from the WC to TextWrangler, then choose Search > Compare Two
Front Documents.

Regards,

Chris
Reply all
Reply to author
Forward
0 new messages