#51 endless merges trying to end branches with aemv'ed files

[Steven Knight]

Trying to end a branch that has aemv'ed files is in an endless loop and can't end. It's down to three files that get messages like:

aegis: project "scons.0.96": change 513: file "test/CacheDir/BuildDir.py" in
the baseline has changed since the last 'aegis -DIFFerence' command,
you need to do a merge

This happens despite repeated merging of these files from the parent branch (aem -gp).

For more details, see the mailing list thread with Subject: line "trying to end a branch, perpetual merging required"

The SCons Aegis repository on sourceforge has been rsync'ed from my private repository demonstrating the problem.