David Poole <dpoole@sitecrafting.com> wrote on 09/13/2006 12:04:56 PM:
> I'll try to answer your questions as best I can, but I'm not a
> subversion expert. I'm the guy that spoke up in a meeting and said "We
> need source control". I believe we're running subversion 1.3.something
> on OS X 10.4. We're using Eclipse and Subclipse as our IDE and interface
> to svn. I think it's a FSFS repository, but I'm not sure. I've been
> unable to reproduce my error, despite the fact that it's happened a
> number of times here; so I'm guessing that Joe discarded the changes
> somehow. I can view the diff - in 43 there's a big block of text that
> dave added, and in 44, the block is gone - but I can't figure out how
> this happened. I'll have to take a closer look at how we're doing
commits.
If they are using Subclipse, they might be using the Synchronize view to
do everything. This will show a conflict on the item, but if they are
inexperienced, perhaps they are just taking the "Mark as Merged" option
without having first merged the changes? If they did this, then that
would update their local revision, while preserving their current local
contents.
If that is the case, instruct them to use the Update option so that
Subversion can automerge the contents and if any conflicts are produced,
they can then resolve them before committing.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 13 19:26:38 2006