Emile Snyder <[EMAIL PROTECTED]> writes: > On Sat, 2005-05-14 at 21:21, Derek Scherger wrote: >> it seems to me that there are three settings for such a hook >> >> - fail on pre-existing files >> (cvs, svn, etc. do this) >> >> - preserve pre-existing files but continue >> (which I think would be useful occasionally) >> >> - clobber pre-existing files >> (what monotone does now) > > I'd like door number 4: move pre-existing files out of the way (foo -> > foo.bak.revid maybe?) and continue.
There's also my favourite, and what mt does if I remember to add the file before updating: 2-way merge of the local and repo version. -- Robbe _______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
