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

Re: Need to run an SVN Update which preserves local changes

From: Ryan Schmidt <subversion-2009b_at_ryandesign.com>
Date: Wed, 29 Jul 2009 08:32:35 -0500

On Jul 29, 2009, at 07:14, Alexander Maw wrote:

> 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.

Subversion is designed to not overwrite your local changes. If you
believe Subversion is doing so, please show a transcript.

What Subversion should be doing when you update locally-changed
(text) files is to incorporate the upstream changes into the local
file and preserve your changes. If the upstream and local changes
overlap, that is called a conflict, and Subversion asks what you want
to have happen. I assume if you update locally-changed binary files,
it will always be a conflict. You may be looking for the --accept
option to the svn update command, which lets you specify what you
want to have Subversion do when a conflict occurs. Specifically, you
may want "svn up --accept mine-full".


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-29 15:33:28 CEST

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