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

Re: Feature Request for Merge related functions

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-07-13 18:03:28 CEST

Mark Pickersgill wrote:

> - Add a "Diff with..." or "Compare with..." context menu option that
> allows a folder or file to be compared with either a nominated, external
> (outside of the repository) file or folder or a file/folder in the
> repository.
>
> Reason/Usefulness: Useful for quickly comparing a full file that has
> been sent to you, rather than having to commit it to the repository to
> diff the changes or try and invoke another merge tool. Also useful for
> easily comparing changes between say trunk and a branch version of a
> file or folder.

That's already there with shift-right-click. And it now also works for
folders.

> - If you right click on a folder under subversion control and select
> "Merge..." it would be nice if it filled out the "From" url with the
> selected file/folder as other TortoiseSVN dialogs "tend" to do.
>
> Reason/Usefulness: If you've already selected the file or folder you
> want to merge, you have to re-enter in the url each time you crank up
> the Merge dialog. Also the history list doesn't seem to save unless the
> merge is "ok"ed (which is probably sensible), so the list may not have
> the url on which you were previously doing a "dry run".

There's an option for this in the settings dialog.
Look and Feel->Dialogs 1->Merge->"Use URL of WC as the default "From:" URL"

> - In the Merge window, as well as the "Unified Diff" button, add a
> "Compare" button that shows the differences in the same manner as
> selecting two folders in the Repo-Browser and selecting "Compare
> Revisions". ie if it's two files you are merging, show the TortoiseMerge
> window straight away, but if it's a folder you're merging, show the list
> box of differing files.
>
> Reason/Usefulness: A Unified Diff view isn't a particularly friendly
> view of a difference on a file. The only way to do this at the moment
> (as described in section B.5. of the help) is to diff the two folders
> from the repo browser. This is quite cumbersome when you have many
> folders in the repository.

http://tortoisesvn.berlios.de/issues/?do=details&id=267

> - In the "Dry Run" form, allow the diff tool to be invoked on individual
> files so you can see what it will do.

Not sure what you want here exactly. The "Dry Run" feature is from the
Subversion library. It doesn't provide diffing information at all.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jul 13 18:03:41 2006

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