At Tue, 1 Dec 2009 08:47:34 +0300, Dmitry Potapov <dpotapov@xxxxxxxxx> wrote: Subject: Re: "git merge" merges too much! > > On Mon, Nov 30, 2009 at 07:24:14PM -0500, Greg A. Woods wrote: > > > > Things get even weirder if you happen to be playing with older branches > > too -- most build tools don't have ability to follow files that go back > > in time as they assume any product files newer than the sources are > > already up-to-date, no matter how much older the sources might become on > > a second build. > > No, files do not go back in time when you switch between branches. The > timestamp on files is the time when they are written to your working > tree Hmmm, I didn't really say anything in particular about file timestamps -- I meant the file content may go back in time. More correctly I should have said that the file content may become inconsistent with the state of other files that have just been compiled. If the timestamps do not get set back to commit time, but rather are simply updated to move the last modify time to the time each change is made to a working file (which is as you said, to be expected), regardless of whether its content goes back in time or not, then this may or may not help a currently running build to figure out what really needs to be re-compiled. Likely it won't even for a recursive-make style update build, but certainly not for one where all build actions are pre-determined before any of them are started. If the content of one or more files goes back in time to an earlier state while the compile is happening then ultimately the result must be considered to be undefined. The best you can hope for is a break in the compile. This is why I agreed with you that a build should never be done in a working directory where any file editing or VCS action is occurring simultaneously. I just disagreed that "git archive" was a reasonable alternative to leaving the working directory alone during the entire time of the build. It is not really reasonable for large projects any more than stopping all work on the sources is reasonable. -- Greg A. Woods Planix, Inc. <woods@xxxxxxxxxx> +1 416 218 0099 http://www.planix.com/
Attachment:
pgpknC2jHCkBZ.pgp
Description: PGP signature