Re: Henrik - bug in cvs* scripts - don't check for SHELL

Ouch.. I imagine a lot of shell escapes will misbehave in such case..

Anyway, planning on splitting the script in two stages, terminating
back to the shell on merge conflicts. The current shell escape is not
a very robust approach to the problem as one may need more time to
resolve the merge conflicts, or want to decide to do the merge at a
later time..

The danger of splitting the script is of one do not finalize the
merge using stage 2 and commits the merge by other means. In such
case the tracking gets slightly out of sync, and the next merge will
be even messier (but not impossible).

Regards
Henrik

On Tuesday 15 January 2002 09.36, Robert Collins wrote:
> Bash was recently altered to not set SHELL anymore. This may result
> in some systems having no SHELL variable - your cvs scripts (in
> particular cvsmerge ) will misbehave in this case.
>
> I wasn't sure what your preferred solution is - ie to require
> SHELL, or to fallback to /bin/sh within the script, but I thought
> you'd like to know :}.
>
> Rob
Received on Tue Jan 15 2002 - 10:48:29 MST