The following diff lets you use "file:FILENAME" where a datespec is
needed (e.g., -D flag) -- it gets the date from the file's modtime. It
also adds "date:" as a prefix in you case you already have a file named
11/01/00  :)

It seems to me this makes merging in&out among branches easier and safer
(more atomic) -- you don't have to worry about someone coming in and
updating a file between your merges.  Right?

Here's how I'd use it to merge out from the main to my branch.  Make
sense?
        update -jHEAD:file:.last -jHEAD:file:now >.now && mv .now .last

        /r$

PS:  Apologies for the test-spam the other day; this is my third attempt
to get this note out to the list.

Reply via email to