On Tue, Aug 5, 2008 at 11:42, Maze, Jeffrey S. <JMaze_at_co.geauga.oh.us> wrote:
> Hello..
> I tried some Googlin' and didn't find anything worth while on
> this subject, but here's our issue.
> Say we're working on a web site project and there are a couple
> users working on the site.
>
> User1 has a local copy of the repository on their computer and
> they make changes here which they then commit to the SVN.
> User2 is a user which is logging directly on the web server to
> make changes to the server's local copy of the repository. The test web
> site sees their changes immediately.
>
> The issue is that User1 and User2 just happen to make changes to
> the same file; User1 adds a function, User2 is editing a different
> function.
>
> User1 commits their changes, but what will happen to User2's
> changes when they go to commit their changes?
You cannot commit from a WC which is out of date with respect to the repository.
> Will Tortoise report to User2 that there's a mismatch and they
> need to update the local copy first?
Yes
> Won't updating the file overwrite the changes just made by
> User2?
No. Subversion will merge the changes from User1 into User2's working
copy. If any lines were changed by both users, User2 will need to
manually reconcile those conflicts.
This is explained in the fine manual.
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-update.html
is a good starting place.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-05 17:53:43 CEST