AFAIK, there is no way to do an svn update that does not do a merge.
There is a way to automatically handle conflicting changes( as was
previously posted) but that's not what you're asking about.
No local changes will be lost. We've been using Subversion for about a
year now and in my experience (limited though it may be) doing the merge
is a good thing. We were initially worried that the merge was going to
create a lot of problems. That hasn't happened.
You will want to understand conflict resolution. TortoiseSVN has a very
nice conflict editor. It's here that a user can ask for local changes
to be forgotten in favor of another set of changes.
You will also want to understand the needs-lock property (for binary
files).
The book is very helpful. If you haven't read it, you should. It
answered most of my questions.
Brian
> -----Original Message-----
> From: Alexander Maw [mailto:icouldntgetagoodname_at_gmail.com]
> Sent: Wednesday, July 29, 2009 8:14 AM
> To: users_at_subversion.tigris.org
> Subject: RE: Need to run an SVN Update which preserves local changes
>
> The team doesn't want their stuff to be merged or submitted
> by the update. When they are working on a file, they want it
> to be left alone by the update, as right now it will
> overwrite their local changes and their work will be lost.
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&
dsMessageId=2376570
>
> To unsubscribe from this discussion, e-mail:
> [users-unsubscribe_at_subversion.tigris.org].
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2376655
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-29 18:51:53 CEST