Re: aerb "file has been altered" errors after removing files in branch
Aryeh Friedman <[email protected]> Fri, 22 Apr 2016 13:26:41 -0400
| Newsgroups | gmane.comp.version-control.aegis.user |
|---|---|
| Message-ID | <CAGBxaXmCB5472tdCAgkkG49PQzXfums_eF6Yask5qnejx2k8-g@mail.gmail.com> |
--===============5964799657824047316== Content-Type: multipart/alternative; boundary=001a1140f32a49d34205311621d1 --001a1140f32a49d34205311621d1 Content-Type: text/plain; charset=UTF-8 The actual structure of the ,D depends on your history tool. On Fri, Apr 22, 2016 at 1:24 PM, Calvin Webster <[email protected]> wrote: > On Fri, 2016-04-22 at 12:59 -0400, Aryeh Friedman wrote: > > 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 > > That's not really an option for me. This branch cannot be left hanging > open. This is an off-line (isolated) US Govt repository that I've been > maintaining since the late 90's. There has to be a less brutal way to > get this branch integrated. > > Does anyone on the list have other ideas? Anyone familiar with Aegis > repository structure got a way to manipulate the history files or > source/diff time stamps to prevent this error from blocking the > integration? > > The error indicates a file has been altered. I'm assuming Aegis is > comparing time stamps on some files. Whether these are recorded time > stamps in metadata or read directly from repo files, I'm not certain. > Isn't there a way to reset one or more these date/time stamps that are > being referenced so Aegis is happy? I've tried various changes using > "touch" and editing diff (,D) date/time lines with no luck so far. > > > > > 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 > > > > _______________________________________________ > > Aegis-users mailing list > > [email protected] > > https://lists.auug.org.au/listinfo/aegis-users > > > -- Aryeh M. Friedman, Lead Developer, http://www.PetiteCloud.org --001a1140f32a49d34205311621d1 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr">The actual structure of the ,D depends on your history too= l.<br></div><div class=3D"gmail_extra"><br><div class=3D"gmail_quote">On Fr= i, Apr 22, 2016 at 1:24 PM, Calvin Webster <span dir=3D"ltr"><<a href=3D= "mailto:[email protected]" target=3D"_blank">[email protected]</a>></s= pan> wrote:<br><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex= ;border-left:1px #ccc solid;padding-left:1ex"><span class=3D"">On Fri, 2016= -04-22 at 12:59 -0400, Aryeh Friedman wrote:<br> > Brancing in general is broken.=C2=A0 For example I get the same issue = when<br> > attempting to close a branch even with no files have been aerm'ed.= <br> > Your best bet is to use aedist from the branch change set to the<br> > parent baseline.=C2=A0 =C2=A0 For example if your branch is foo.1 do a= edist -p<br> > foo -c 1 -s><a href=3D"http://foo.ae" rel=3D"noreferrer" target=3D"= _blank">foo.ae</a> && aedist -p foo -r<<a href=3D"http://foo.ae"= rel=3D"noreferrer" target=3D"_blank">foo.ae</a><br> <br> </span>That's not really an option for me. This branch cannot be left h= anging<br> open. This is an off-line (isolated) US Govt repository that I've been<= br> maintaining since the late 90's. There has to be a less brutal way to<b= r> get this branch integrated.<br> <br> Does anyone on the list have other ideas? Anyone familiar with Aegis<br> repository structure got a way to manipulate the history files or<br> source/diff time stamps to prevent this error from blocking the<br> integration?<br> <br> The error indicates a file has been altered. I'm assuming Aegis is<br> comparing time stamps on some files. Whether these are recorded time<br> stamps in metadata or read directly from repo files, I'm not certain.<b= r> Isn't there a way to reset one or more these date/time stamps that are<= br> being referenced so Aegis is happy? I've tried various changes using<br= > "touch" and editing diff (,D) date/time lines with no luck so far= .<br> <div class=3D"HOEnZb"><div class=3D"h5"><br> <br> <br> > On Fri, Apr 22, 2016 at 12:28 PM, Calvin Webster <<a href=3D"mailto= :[email protected]">[email protected]</a>><br> > wrote:<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0I don't see any posts since 06/04= /2015 - hope there are still<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0a few<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Aegis veterans watching the list.<br> ><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0I've encountered a particularly v= exing problem that I can't<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0seem to<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0overcome. After removing (aerm) a num= ber of files in a change<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0I was able<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0to develop, review, and integrate sev= eral other changes. When<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0it came<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0time to integrate the branch I got th= e following error on just<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0one of<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0the files:<br> ><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0[mtrev@pegasus2 ~]$ aerb -p av8b93.23= -c 15023<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0aegis: project "av8b93.23":= change 15023: file<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"CymSOUND93/bin/buildinfo,D"= ;<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0has been = altered<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0[mtrev@pegasus2 ~]$<br> ><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0I don't really care about the his= tory on this file or the<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0others that<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0were removed. These were derived file= s that should not have<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0been copied<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0in as source to begin with. I just ne= ed to integrate this<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0branch. Any<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0help along these lines would be great= ly appreciated.<br> ><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Strangely, all the files I "aerm= 'd" exist in the branch<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0baseline without<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0any diff files (,D). It has been my e= xperience that when files<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0are<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0removed with aerm, the original file = is removed from the<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0branch baseline<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0and a ,D file is placed there. The ,D= file is a diff<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0against /dev/null<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0with a "-" sign in front of= every line. None of these exist<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0for the<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0files I removed, yet the changes in t= his branch never<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0complained. Each<br> ><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Development directory style does incl= ude copies of derived<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0files. This<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0may be why the original files are sti= ll there but doesn't<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0explain why<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0the ,D files are missing... and why o= nly the one file out of<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0dozens of<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0others?<br> ><br> ><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Other relevant info:<br> ><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0aegis.conf:<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0development_directory_style =3D<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0source_file_symlink =3D= true;<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0derived_file_copy =3D t= rue;<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0derived_file_at_start_o= nly =3D true;<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<br> ><br> ><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Thanks in advance for any help.<br> ><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0./Cal Webster<br> ><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0_____________________________________= __________<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Aegis-users mailing list<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<a href=3D"mailto:[email protected]= uug.org.au">[email protected]</a><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<a href=3D"https://lists.auug.org.au/= listinfo/aegis-users" rel=3D"noreferrer" target=3D"_blank">https://lists.au= ug.org.au/listinfo/aegis-users</a><br> ><br> ><br> ><br> > --<br> > Aryeh M. Friedman, Lead Developer, <a href=3D"http://www.PetiteCloud.o= rg" rel=3D"noreferrer" target=3D"_blank">http://www.PetiteCloud.org</a><br> ><br> > _______________________________________________<br> > Aegis-users mailing list<br> > <a href=3D"mailto:[email protected]">[email protected]= g.org.au</a><br> > <a href=3D"https://lists.auug.org.au/listinfo/aegis-users" rel=3D"nore= ferrer" target=3D"_blank">https://lists.auug.org.au/listinfo/aegis-users</a= ><br> <br> <br> </div></div></blockquote></div><br><br clear=3D"all"><br>-- <br><div class= =3D"gmail_signature"><div dir=3D"ltr">Aryeh M. Friedman, Lead Developer, <a= href=3D"http://www.PetiteCloud.org" target=3D"_blank">http://www.PetiteClo= ud.org</a><br></div></div> </div> --001a1140f32a49d34205311621d1-- --===============5964799657824047316== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWVnaXMtdXNl cnMgbWFpbGluZyBsaXN0CkFlZ2lzLXVzZXJzQGxpc3RzLmF1dWcub3JnLmF1Cmh0dHBzOi8vbGlz dHMuYXV1Zy5vcmcuYXUvbGlzdGluZm8vYWVnaXMtdXNlcnMK --===============5964799657824047316==--