Completely baffled

[Lester Caine]

Paul Boddie wrote:
>> 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.
>
> This sounds a bit like updating on a file-by-file basis or even a
> fragment-by-fragment basis. I've occasionally wanted to be able to split up
> diffs and apply parts of them separately, and I imagine that tools exist to do
> this, but I've been close on occasions to writing one myself (and for a very
> long time, too, remembering considering such things with CVS in about 1998).

EXACTLY ....
This has been my method of working for many years. One can 'update' blocks that 
one is not interested in, but finely monitor anything in the area you are 
working in currently. This is a tool Eclipse provides for CVS and SVN, but 
MercurialEclipse does not provide it, so one ends up cloaning to a local master 
and running BeyondCompare from the copy. This is currently a major backwards 
step in my own work flow ... Although things do seem to be getting there - slowly.

>> 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 ...
>
> Shelve and my own ad-hoc invocations of "hg diff > tmp.diff" are useful tricks,
> but I wouldn't want to be constrained to a single working directory and have to
> rely on them for everything.

That is what I said?

-- 
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