Doug Hardie wrote:> I have been following the discussion on mergemaster and one item is a
> bit annoying. You can use -U in the command args which sets
> "AUTO_UPGRADE=yes".
So far so good.
> That flag is not in mergemaster.rc.
I'm not sure what that is supposed to mean. There is no rc file by
default, you have to create it. If what you mean is that it wasn't
mentioned in the man page, that has been fixed for a while now.
> It could be
> easily added to the rc file, but I suspect it would conflict with -p.
It would not conflict with it, in fact if everything is working as it
should it should be totally safe.
> Hence it seems like if "unset AUTO_UPGRADE" were added to the -p
section
> then it would work.
I try hard not to outthink what the user is trying to do, which of
course works both ways.
> It would be helpful to be able to include it in the
> rc file so I don't have to remember the options each time.
[ -z "$PRE_WORLD" ] && AUTO_UPGRADE=yes
hth,
Doug