On Tuesday 12 June 2007 21:10, Mike Brenner wrote:
> 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.
Mike, I'll be picking on your language because it makes some thing a bit
fuzzy, the distinction between 'update' and 'merge' in the context of
Subversion - don't take it personally.
> Yes, on Monday only the first person coming in
> can merge their changes into the repository.
"...commit their changes..." Their WC's revision number is the repository's
revision number so they can 'svn commit' their changes.
> The rest of the people would like to update
> but cannot because they would be out of date.
"...would like to commit their changes, but cannot because they would be out
of date." Yes, because their changes are based on an old version of the
repository. The simple remedy is to update the WC, i.e. invoke 'svn update'.
> 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.
No problem with that. Firstly, you could restrict your WC to just a single
directory. If that still is too much, you need to manually copy single from
your WC to e.g. your portable memory and then manually copy them back. After
that, it is as if you made your modifications directly in the working copy,
but that is exactly what Les Mikesell already proposed...
I'm still thinking you're doing something wrong, but I'm not sure what that
is. Are you perhaps sharing a WC between different developers? That would be
one case where Subversion can't help you coordinate changes, because they
happen on a filesystem level where it has no influence.
Uli
--
Sator Laser GmbH
Geschäftsführer: Ronald Boers, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 13 09:53:54 2007