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

Re: Create a copy in WC before merging

From: Ryan J Ollos <ryano_at_physiosonics.com>
Date: Wed, 16 Dec 2009 09:44:13 -0800 (PST)

Simon Large-5 wrote:
>
> There is no way to do this using subversion or TortoiseSVN. In order
> to make this work you would have to know in advance which files will
> be updated, so TortoiseSVN would first have to query the repository
> (effectively Check for Modification looking at both local and remote
> changes) before starting the update. I think that would be
> unacceptably slow for most users.
>

If I understand correctly, it seems as though it would be necessary to
create a copy of the working copy in a temporary directory and run the
Update against this temporary working copy. Files from the original working
copy could then be compared against the temporary working copy that has the
update applied.

Isn't what I just described similar to what is done during a Test Merge? I
have always assumed that in a test merge, a copy of the working copy is
created in a temporary directory and the merge is done on those files.

One feature I have always hoped for is the ability to show changes after
selecting a file from the Test Merge dialog window. Particularly in the
case of a conflicted file, sometimes it would be nice to see what parts of
the file are conflicted before going ahead with the merge. At present, it
seems that I cannot select a file from the Test Merge dialog window and
select Show Changes. Would this be practical to implement?

Getting back to the original question, it seems that one realization of the
thread author's request would be the ability to run a `Test Update`,
analogous to a `Test Merge`, and from the dialog window show changes between
the working copy and the Test Update.

-- 
View this message in context: http://old.nabble.com/Create-a-copy-in-WC-before-merging-tp26773984p26815351.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2430855
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-16 18:44:48 CET

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