5/19 motdedit2 is available at ~kchang/bin/motdedit2. The difference
between motdedit and motdedit2 is that motdedit2 does not require
a lock and does friendly merge. For example, if you added a line,
say A, and someone deletes it or changes it to B after a few hours,
you can "restore&merge" which will retain both line A & B.
Restore&merge is done by doing "motdedit2 -r"
\_ Examples of friendly merge using "motdedit2"
Original Your change: Result:
-------- ------------ -------
hello harro hello
world world harro
world
\_ Another example of using "motdedit2 -r"
You typed: Someone changed to: You run motdedit2 -r
---------- ------------------- --------------------
hello h3llo hello
world world sucks world
h3llo
world sucks
\_ I think that's the right thing to be doing. Personally
though I prefer to do the steps separately. I did steal
your merge function to replace the dumb one I was using.
I have it set up pretty well; if I notice someone else's
post get clobbered I can merge that also, because I'm
grabbing a local copy for everything and not just my own
edits. Actually though, having used your merge function
for a while it is a tradeoff... ideally it should attempt
to detect line edits versus new posts. |