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

Re: Update replace files??

From: B. Smith-Mannschott <benpsm_at_gmail.com>
Date: 2007-04-02 17:34:27 CEST

On Apr 2, 2007, at 17:13, igor vieira wrote:

> Its a silly question, but yestarday i got a email where a guy said:
> "I was working in a file "A", before i commit changes i updated the
> local folder, and then i lost what i changed on file "A".
> this is the question:
> Update action overwrite my changes?? Does it replace my changes if
> I change a file??
> As i said to guy: "i think it isnt possible, svn didnt overwritte
> files."
> Am i right?? or no??


Subversion will not replace files you have changed locally when you
do an update.

It will attempt to merge the changes that have been made to the
repository since your last update into your local files. If it can
not do so cleanly, it will generate an update "conflict", which I
would suggest looking up in the Subversion book.

It will not destroy your data. An update conflict, however, can be
confusing for a beginner.

// Ben

> tks.
> Igor Max

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Apr 2 17:35:00 2007

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