You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by ying lcs <yi...@gmail.com> on 2007/02/23 04:41:15 UTC
Question about 'svn update'
Hi,
I checkout the trunk to a working directory.
If I modify some files but before doing a 'svn commit' I did a 'svn update',
what happens to the files that I have changed?
I tired that, it looks like my changes are gone and they are replaced
by the files that in in the trunk. Can you please tell me if svn
saves a copy of the files that i modified in my working directory
somewhere?
Thank you.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Question about 'svn update'
Posted by Ulrich Eckhardt <ec...@satorlaser.com>.
On Friday 23 February 2007 05:41, ying lcs wrote:
> If I modify some files but before doing a 'svn commit' I did a 'svn
> update', what happens to the files that I have changed?
>
> I tired that, it looks like my changes are gone and they are replaced
> by the files that in in the trunk.
One of SVN's goals is to never destroy anything without explicit consent. Just
doing 'svn up' doesn't count as explicit consent, rather 'svn up' merges
changes done to the repository into your working copy, but will not discard
your changes.
> Can you please tell me if svn saves a copy of the files that i modified
> in my working directory somewhere?
This shouldn't have happened, I guess something else went wrong, like that you
changed it in an editor but didn't save it and when the 'svn up' changed the
file the editor reloaded it and discarded your changes.
Uli
--
ML: http://subversion.tigris.org/mailing-list-guidelines.html
FAQ: http://subversion.tigris.org/faq.html
Docs: http://svnbook.red-bean.com/
Sator Laser GmbH
Geschäftsführer: Ronald Boers Steuernummer: 02/892/02900
Amtsgericht Hamburg HR B62 932 USt-Id.Nr.: DE183047360
**************************************************************************************
Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Question about 'svn update'
Posted by Matt Sickler <cr...@gmail.com>.
when you update svn tries to merge the changes from the repo with your own
changes, in no way should your changes disappear
On 2/22/07, ying lcs <yi...@gmail.com> wrote:
>
> Hi,
>
> I checkout the trunk to a working directory.
> If I modify some files but before doing a 'svn commit' I did a 'svn
> update',
> what happens to the files that I have changed?
>
> I tired that, it looks like my changes are gone and they are replaced
> by the files that in in the trunk. Can you please tell me if svn
> saves a copy of the files that i modified in my working directory
> somewhere?
>
> Thank you.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>