Les Mikesell wrote:
>> Weekend warriors take home work, where there
>> might not be subversion access.
>
> OK, so they copy it out of their own working copy from work. Better
> yet, they take the whole working copy. What are they taking it home on?
> You can get 120gig external USB drives that fit in your pocket these
> days and run on the USB power. The point is that if you didn't bring
> the whole working copy along you put the modified files back where they
> belong in the wc so it is just the same as if you had completed the edit
> there.
>
>> The second person who copies his stuff
>> gets a subversion error about out of date
>> source code, and has to overwrite, rather
>> than merge their changes into subversion.
>
> What does taking the file home have to do with this? When you get an out
> of date error it means you need to update. The merge happens in your wc
> and then you commit the result. If you get a 'C' status you have to
> clean it up by hand. The same thing should happen with local edits to
> the same file.
Sorry for replying to myself here, but did I miss what has been going
on? Have different people _already_ removed and replaced this file so
your edited version and it's pristine .svn copy no longer has a history
in the repostory - which now sees an unrelated replacement? If that's
the case I see why you think you can't merge, but the only solution is
for everyone to stop doing that.
--
Les Mikesell
lesmikesell@gmail.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 30 22:43:03 2007