Mike Brenner wrote:
>>> Weekend warriors take home work, where there
>>> might not be subversion access.
Les Mikesell wrote:
>> 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.
Mike Brenner wrote:
>>> The SECOND weekend warrior 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.
Les Mikesell wrote:
>> 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.
Les Mikesell wrote:
> 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.
Hi Les,
Yes, on Monday only the first person coming in
can merge their changes into the repository.
The rest of the people would like to update
but cannot because they would be out of date.
Telling us to "stop doing that" is not the
complete answer, because sometimes there are
reasons not to take the whole repository home,
yet there are reasons to take certain files home
to work on them.
So, a suggestion for a far distant change to subversion
might be to isolate the MERGE process from the
"current version" process, to allow multiple merges
into a single version like this. Or perhaps to find
some EXTERNAL TOOL to do the multiple merges and
then just check in the final result after the last
weekend warrior finishes their EXTERNAL TOOL merge?
Does anyone know of such an EXTERNAL TOOL?
Mike Brenner
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 12 21:32:19 2007