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

>

Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447

-----Original Message-----

> From: Alexander Maw [mailto:icouldntgetagoodname_at_gmail.com]
> Sent: 29 July 2009 13:14
> 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.
>

The update command does not submit anything. Maybe you're confusing with update in a CVS sense? I have never used CVS but I remember discussion on this ML and I think update in CVS does what commit does in Subversion. Update in Subversion, on the other hand, just keep your working copy up-to-date with changes that other people have made and committed to the reposiroty.

Are we talking about binary files by any chance? For example, Word documents? In that case you are probably right, the update would overwrite their copy because Subversion cannot merge binary files (but I don't have direct experience with them so I may be wrong). You probably want to look into the svn:need-lock property for the files.

G

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2376580

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