Re: aerb "file has been altered" errors after removing files in branch

--===============7570465398474924623==
Content-Type: multipart/alternative; boundary=001a114ac34c3a570b053115c0a0

--001a114ac34c3a570b053115c0a0
Content-Type: text/plain; charset=UTF-8

Brancing in general is broken.  For example I get the same issue when
attempting to close a branch even with no files have been aerm'ed.   Your
best bet is to use aedist from the branch change set to the parent
baseline.    For example if your branch is foo.1 do aedist -p foo -c 1 -s>
foo.ae && aedist -p foo -r<foo.ae

On Fri, Apr 22, 2016 at 12:28 PM, Calvin Webster <[email protected]> wrote:

> I don't see any posts since 06/04/2015 - hope there are still a few
> Aegis veterans watching the list.
>
> I've encountered a particularly vexing problem that I can't seem to
> overcome. After removing (aerm) a number of files in a change I was able
> to develop, review, and integrate several other changes. When it came
> time to integrate the branch I got the following error on just one of
> the files:
>
> [mtrev@pegasus2 ~]$ aerb -p av8b93.23 -c 15023
> aegis: project "av8b93.23": change 15023: file
> "CymSOUND93/bin/buildinfo,D"
>         has been altered
> [mtrev@pegasus2 ~]$
>
> I don't really care about the history on this file or the others that
> were removed. These were derived files that should not have been copied
> in as source to begin with. I just need to integrate this branch. Any
> help along these lines would be greatly appreciated.
>
> Strangely, all the files I "aerm'd" exist in the branch baseline without
> any diff files (,D). It has been my experience that when files are
> removed with aerm, the original file is removed from the branch baseline
> and a ,D file is placed there. The ,D file is a diff against /dev/null
> with a "-" sign in front of every line. None of these exist for the
> files I removed, yet the changes in this branch never complained. Each
>
> Development directory style does include copies of derived files. This
> may be why the original files are still there but doesn't explain why
> the ,D files are missing... and why only the one file out of dozens of
> others?
>
>
> Other relevant info:
>
> aegis.conf:
> development_directory_style =
> {
>     source_file_symlink = true;
>     derived_file_copy = true;
>     derived_file_at_start_only = true;
> }
>
>
> Thanks in advance for any help.
>
> ./Cal Webster
>
> _______________________________________________
> Aegis-users mailing list
> [email protected]
> https://lists.auug.org.au/listinfo/aegis-users
>



-- 
Aryeh M. Friedman, Lead Developer, http://www.PetiteCloud.org

--001a114ac34c3a570b053115c0a0
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">Brancing in general is broken.=C2=A0 For example I get the=
 same issue when attempting to close a branch even with no files have been =
aerm&#39;ed.=C2=A0=C2=A0 Your best bet is to use aedist from the branch cha=
nge set to the parent baseline.=C2=A0=C2=A0=C2=A0 For example if your branc=
h is foo.1 do aedist -p foo -c 1 -s&gt;<a href=3D"http://foo.ae">foo.ae</a>=
 &amp;&amp; aedist -p foo -r&lt;<a href=3D"http://foo.ae">foo.ae</a><br></d=
iv><div class=3D"gmail_extra"><br><div class=3D"gmail_quote">On Fri, Apr 22=
, 2016 at 12:28 PM, Calvin Webster <span dir=3D"ltr">&lt;<a href=3D"mailto:=
[email protected]" target=3D"_blank">[email protected]</a>&gt;</span> wro=
te:<br><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-=
left:1px #ccc solid;padding-left:1ex">I don&#39;t see any posts since 06/04=
/2015 - hope there are still a few<br>
Aegis veterans watching the list.<br>
<br>
I&#39;ve encountered a particularly vexing problem that I can&#39;t seem to=
<br>
overcome. After removing (aerm) a number of files in a change I was able<br=
>
to develop, review, and integrate several other changes. When it came<br>
time to integrate the branch I got the following error on just one of<br>
the files:<br>
<br>
[mtrev@pegasus2 ~]$ aerb -p av8b93.23 -c 15023<br>
aegis: project &quot;av8b93.23&quot;: change 15023: file<br>
&quot;CymSOUND93/bin/buildinfo,D&quot;<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 has been altered<br>
[mtrev@pegasus2 ~]$<br>
<br>
I don&#39;t really care about the history on this file or the others that<b=
r>
were removed. These were derived files that should not have been copied<br>
in as source to begin with. I just need to integrate this branch. Any<br>
help along these lines would be greatly appreciated.<br>
<br>
Strangely, all the files I &quot;aerm&#39;d&quot; exist in the branch basel=
ine without<br>
any diff files (,D). It has been my experience that when files are<br>
removed with aerm, the original file is removed from the branch baseline<br=
>
and a ,D file is placed there. The ,D file is a diff against /dev/null<br>
with a &quot;-&quot; sign in front of every line. None of these exist for t=
he<br>
files I removed, yet the changes in this branch never complained. Each<br>
<br>
Development directory style does include copies of derived files. This<br>
may be why the original files are still there but doesn&#39;t explain why<b=
r>
the ,D files are missing... and why only the one file out of dozens of<br>
others?<br>
<br>
<br>
Other relevant info:<br>
<br>
aegis.conf:<br>
development_directory_style =3D<br>
{<br>
=C2=A0 =C2=A0 source_file_symlink =3D true;<br>
=C2=A0 =C2=A0 derived_file_copy =3D true;<br>
=C2=A0 =C2=A0 derived_file_at_start_only =3D true;<br>
}<br>
<br>
<br>
Thanks in advance for any help.<br>
<br>
./Cal Webster<br>
<br>
_______________________________________________<br>
Aegis-users mailing list<br>
<a href=3D"mailto:[email protected]">[email protected]=
.au</a><br>
<a href=3D"https://lists.auug.org.au/listinfo/aegis-users" rel=3D"noreferre=
r" target=3D"_blank">https://lists.auug.org.au/listinfo/aegis-users</a><br>
</blockquote></div><br><br clear=3D"all"><br>-- <br><div class=3D"gmail_sig=
nature"><div dir=3D"ltr">Aryeh M. Friedman, Lead Developer, <a href=3D"http=
://www.PetiteCloud.org" target=3D"_blank">http://www.PetiteCloud.org</a><br=
></div></div>
</div>

--001a114ac34c3a570b053115c0a0--

--===============7570465398474924623==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWVnaXMtdXNl
cnMgbWFpbGluZyBsaXN0CkFlZ2lzLXVzZXJzQGxpc3RzLmF1dWcub3JnLmF1Cmh0dHBzOi8vbGlz
dHMuYXV1Zy5vcmcuYXUvbGlzdGluZm8vYWVnaXMtdXNlcnMK

--===============7570465398474924623==--