[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: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Mon, 14 Dec 2009 14:38:51 +0000

2009/12/14 welo <walid_alkaakati_at_yahoo.com>:
> Hallo,
>
> In my case i want to do the comparison after i update to revision 11,the comparison is between revision 11 and what i have changed on revision 10.
>
> So how can create a copy of this changeg file
> before i issue update to revision 11? i need this copy to return to it later if i have problems with merging.
>
> Any Hint ??

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.

A better way of working is to commit your changes to the branch first
before merging from trunk. We have had a related feature request only
today which is to provide a warning if you attempt to merge into a
modified working copy.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2430294
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-14 15:39:02 CET

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