Date: Mon, 19 Jan 2004 14:48:59 -0500 From: Garance A Drosihn <drosih@rpi.edu> To: Eric Anderson <anderson@centtech.com> Cc: Bill Moran <wmoran@potentialtech.com> Subject: Re: question on mergemaster Message-ID: <p06020482bc31e3aad9bd@[128.113.24.47]> In-Reply-To: <400C3141.40505@centtech.com> References: <400C012E.4040002@mail.ru> <400C0E5F.5010606@potentialtech.com> <p0602047fbc31d1dbad30@[128.113.24.47]> <400C2CF3.6080401@centtech.com> <p06020480bc31ddf58349@[128.113.24.47]> <400C3141.40505@centtech.com>
next in thread | previous in thread | raw e-mail | index | archive | help
At 1:34 PM -0600 1/19/04, Eric Anderson wrote:
>
>Here's my thoughts - first, you have to manually ask it to
>run -I, then you have to also put in the autoupdate
>line - if you mistype it, it just won't autoupdate,
>it will prompt.
Note that there were two different proposals. The "optimistic"
one, and the "pessimistic" one. My concerns about streamlining
were related to proposal described as:
The optimistic way to do this would be to have some
sort of switch to mergemaster to tell it to go into
autoupdate mode, and it will only ask for files that
^^^^^^^^^^^^^^^^
contain a "negative magic" like:
^^^^^^^
# mergemaster noautoreplace
This is easier to implement than the pessimistic one, IMO, but
it also comes with a greater risk. I don't like that risk.
--
Garance Alistair Drosehn = gad@gilead.netel.rpi.edu
Senior Systems Programmer or gad@freebsd.org
Rensselaer Polytechnic Institute or drosih@rpi.edu
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?p06020482bc31e3aad9bd>