CODEWITHSUNDEEP
svn
Alexander
Alexander

Reputation: 779

Check for diff on update

I installed fresh copy of svn from ubuntu repositiory. Version is 1.6.12.

Now, for example, lets say there are two users: User1 and User2.

Day1.

  1. Any of users imports new project. Project consists of 1 file: main.cpp.
  2. Both users make checkout, now they both have working copies.

Day2.

  1. User1 comes to work,deletes everything from main.cpp, commits and goes home.

  2. User2 comes to work after User1 left updates and he get empty main.cpp from repository without any prompts of conflicts.

So the question if is it possible to tune svn so it prompts on conflict on update in situation as described above?

Upvotes: 0

Views: 147

Answers (2)

Lazy Badger
Lazy Badger

Reputation: 97280

in situation as described above?

There are not conflicts, because user2 doesn't have any local changes, which can produce conflict and require manual-merge

Upvotes: 2

bmk
bmk

Reputation: 14137

Actually there is no conflict unless User2 also made a change before updating.

svn update simply means that the working copy is updated with the latest revision from the repository. So it is expected (and intended) behavior that the empty file (which is the latest revision of the file) is fetched into the working copy.

Upvotes: 2

Related Questions