Cool thanks Gary that worked!! Pam
From: Gary Wu <[email protected]> Date: Thursday, April 5, 2018 at 12:39 PM To: "DRAGOSH, PAMELA L (PAM)" <[email protected]>, "Morales, Victor" <[email protected]>, Yunxia Chen <[email protected]>, "[email protected]" <[email protected]>, "PLATANIA, MARCO (MARCO)" <[email protected]> Subject: RE: [onap-discuss] [integration] Problem with integration repo Turns out that was the only file that had this issue. I’ve submitted https://gerrit.onap.org/r/#/c/41217/<https://urldefense.proofpoint.com/v2/url?u=https-3A__gerrit.onap.org_r_-23_c_41217_&d=DwMGaQ&c=LFYZ-o9_HUMeMTSQicvjIg&r=jwTiArcEj6aUX0HjV0M3dT12gUtk7rC07xpgpVZkS_4&m=wWNapxWawcd1VGsJ6AfNvKALes3-erPFT7ENr4JvswU&s=G0ZVmt0c9rCHdMCB5kpTWzpVS2tE0tjICtT-tnWFe8k&e=> to change the CRLF. Marco can you help merge once the verify job completes? Thanks, Gary From: Gary Wu Sent: Thursday, April 05, 2018 9:34 AM To: 'DRAGOSH, PAMELA L (PAM)' <[email protected]>; Morales, Victor <[email protected]>; Yunxia Chen <[email protected]>; [email protected]; PLATANIA, MARCO (MARCO) <[email protected]> Subject: RE: [onap-discuss] [integration] Problem with integration repo It definitely has to do with the .gitattributes file, but somehow that file doesn’t trigger git to auto-convert the line endings on my (Linux) system. It may also have to do with the git version. I do see the CRLF in the file, though. Let me see if I can first do a mass conversion of all the CRLFs in the repo. Thanks, Gary From: DRAGOSH, PAMELA L (PAM) [mailto:[email protected]] Sent: Thursday, April 05, 2018 9:01 AM To: Morales, Victor <[email protected]<mailto:[email protected]>>; Yunxia Chen <[email protected]<mailto:[email protected]>>; [email protected]<mailto:[email protected]>; PLATANIA, MARCO (MARCO) <[email protected]<mailto:[email protected]>>; Gary Wu <[email protected]<mailto:[email protected]>> Subject: Re: [onap-discuss] [integration] Problem with integration repo The .gitattributes show this: cat .gitattributes * text=auto eol=lf Me changing the global doesn’t help to fix it. Git still thinks I have modified this file. It seems that someone jammed in some ‘\r’ characters into this file: [id:[email protected]] Even if I try to fix it using vim git still seems to think it has CRLF. Pam From: "Morales, Victor" <[email protected]<mailto:[email protected]>> Date: Thursday, April 5, 2018 at 11:43 AM To: Yunxia Chen <[email protected]<mailto:[email protected]>>, "DRAGOSH, PAMELA L (PAM)" <[email protected]<mailto:[email protected]>>, "[email protected]<mailto:[email protected]>" <[email protected]<mailto:[email protected]>>, "PLATANIA, MARCO (MARCO)" <[email protected]<mailto:[email protected]>>, Gary Wu <[email protected]<mailto:[email protected]>> Subject: Re: [onap-discuss] [integration] Problem with integration repo More likely, those scripts were created using Windows encoding. Maybe you’ll have to configure your git (https://stackoverflow.com/questions/1967370/git-replacing-lf-with-crlf#1967986)<https://urldefense.proofpoint.com/v2/url?u=https-3A__stackoverflow.com_questions_1967370_git-2Dreplacing-2Dlf-2Dwith-2Dcrlf-231967986-29&d=DwMGaQ&c=LFYZ-o9_HUMeMTSQicvjIg&r=jwTiArcEj6aUX0HjV0M3dT12gUtk7rC07xpgpVZkS_4&m=JU3QZ1P58JewdOulaOqnwfsVXhQnhEu34vIivlNAJBE&s=nNgHV31NYZuBv445KyQQdo_TFdvUKnkiSkYR38rxQqo&e=>. Regards, Victor Morales From: <[email protected]<mailto:[email protected]>> on behalf of Yunxia Chen <[email protected]<mailto:[email protected]>> Date: Thursday, April 5, 2018 at 8:21 AM To: "DRAGOSH, PAMELA L (PAM)" <[email protected]<mailto:[email protected]>>, "[email protected]<mailto:[email protected]>" <[email protected]<mailto:[email protected]>>, "PLATANIA, MARCO (MARCO)" <[email protected]<mailto:[email protected]>>, Gary Wu <[email protected]<mailto:[email protected]>> Subject: Re: [onap-discuss] [integration] Problem with integration repo Hi, Marco & Gary, Does this have anything to do with those scripts you created? Regards, Helen Chen From: <[email protected]<mailto:[email protected]>> on behalf of "DRAGOSH, PAMELA L (PAM)" <[email protected]<mailto:[email protected]>> Date: Thursday, April 5, 2018 at 8:03 AM To: onap-discuss <[email protected]<mailto:[email protected]>> Subject: [onap-discuss] [integration] Problem with integration repo Hi Integration team, I am trying to update the integration version manifest, but I am having difficulty with a particular file that seems to automatically get modified every time I do a clean clone or checkout: test/csit/plans/vfc-nfvo-wfengine/sanity-check/testplan.txt Even when I start from scratch with a brand new clone this file is modified on a fresh clone. When I try to stash it I get this issue: warning: CRLF will be replaced by LF in test/csit/plans/vfc-nfvo-wfengine/sanity-check/testplan.txt. The file will have its original line endings in your working directory. Saved working directory and index state WIP on master: b5529a6 Changes to match OOM refactoring HEAD is now at b5529a6 Changes to match OOM refactoring But git still thinks I have modified it, while I have not. Is the CRLF work around for this? I am working on MacOS. Thanks, Pam
_______________________________________________ onap-discuss mailing list [email protected] https://lists.onap.org/mailman/listinfo/onap-discuss
