Completely baffled

[Lester Caine]

Liam Routt wrote:
> Prior to doing the checkin of the work he'd done, he did a pull + update. During
> the course of that, with no prompts of any sort, the largefile system replaced
> the key flash file he'd been editing with the version from before his changes.
> No one else has changed the file for several days, so it was not a case of
> incoming changes which needed to be merged (and he was not prompted to resolve
> any conflicts), his changed file was simply replaced with the "current" version
> as part of the pull + update, and as a result of course disappeared from the
> list of files to be committed (as we have seen before).

Largefiles seems to be a red herring in this ...

This is exactly to be expected activity IF the local changes had not been 
committed. I've managed to do much the same myself ...
The one thing to remember that what is 'active' in the directory is the 
'version' of the files that you select from hg, and this means that if you HAVE 
made any changes but not committed them ... they will be lost. Same as if you 
roll back to a different revision.

With CVS/SVN setups, I was quite happy to keep local copies of a revision in a 
different directory, and this seems a safe way of working with dvcs as well. At 
least then you can compare builds. But the key thing that still irritates me is 
the still missing step of 'syncing' with the 'master' copy. In Eclipse I get a 
list of files changed, and can compare my own local changes with changes others 
have done potentially even in the same area of work. I can 'update' the local 
copy with just the lines I need and create a new local version ready to actually 
commit. This is something that is essential for SOME methods of working and the 
lack of that step HAS caused me to overwrite local work while I was learning a 
new process.

Shelve is a useful half way house for development versions, but keeping two or 
more directory trees in parallel works well with PHP development since I can 
'run' the working copy at the same time as the development one and verify fixes. 
So I clone more than one local copy nowadays ...

-- 
Lester Caine - G8HFL
-----------------------------
Contact - http://lsces.co.uk/wiki/?page=contact
L.S.Caine Electronic Services - http://lsces.co.uk
EnquirySolve - http://enquirysolve.com/
Model Engineers Digital Workshop - http://medw.co.uk//
Firebird - http://www.firebirdsql.org/index.php