Assuming branch 95 is the one in which you just did an integration, the
changed since last -difference message seems rather bogus. The most likely
reason is the files are stored on one server and you are running on a
different machine and the two don't agree on what time it is. Is that
possible in your configuration?
--
Jerry Pendergraft jerry.pendergraft@xxxxxxxxxxxxxxx
Endocardial Solutions voice: 651-523-6935
1350 Energy Lane, Suite 110 fax: 651-644-7897
St Paul, MN 55108-5254 mobile: 651-491-0163
On Tue, 17 Aug 2004, Steven Knight wrote:
> Arg! Setting the RCS locks by hand got me past my aeipass barrier,
> but now when I try to aede the branch again, I *still* get complaints
> about the files having changed in the baseline:
>
> $ aede 95
> aegis: project "scons.0": change 95: file "src/engine/SCons/Scanner/IDLTests.
> py" in the baseline has changed since the last 'aegis -DIFFerence'
> command, you need to do a merge
> aegis: project "scons.0": change 95: file "src/engine/SCons/WarningsTests.py"
> in the baseline has changed since the last 'aegis -DIFFerence'
> command,
> you need to do a merge
> aegis: project "scons.0": change 95: found 2 errors, this change remains in
> the
> 'being_developed' state
> $
>
> This is after having gone through a subsidiary change that did an explicit
> "aem - aed - aeb - etc." That's how I've always dealt with cross-branch
> merges in the past. Am I overlooking something?
>
> --SK
>
> _______________________________________________
> Aegis-users mailing list
> Aegis-users@xxxxxxxxxxx
> http://www.auug.org.au/mailman/listinfo/aegis-users
>
|
