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

Allow diff between two files in commit dialog

From: Ryan J Ollos <ryano_at_physiosonics.com>
Date: Wed, 28 Sep 2011 23:32:37 -0700 (PDT)

When performing a merge that contains a changeset with a file rename, a tree
conflict results. I then proceed to try and figure out whether I can just
delete the file with the tree conflict (i.e. the deleted file in the merged
changeset), and accept the added file. However, I want to know if the
contents of the two files differ, so I want to diff the files.

It would be great if I could just select two files in either the Commit
Dialog or the Check for Modifications Dialog, and diff them. Hopefully this
is explained by the screen capture that follows.

http://old.nabble.com/file/p32550881/Would_Be_Convenient_If_I_Could_Invoke_Diff_On_These.png
Would_Be_Convenient_If_I_Could_Invoke_Diff_On_These.png

-- 
View this message in context: http://old.nabble.com/Allow-diff-between-two-files-in-commit-dialog-tp32550881p32550881.html
Sent from the tortoisesvn - dev mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2847534
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-09-29 08:32:46 CEST

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

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