Re: 1 cset was pushed to modules/xproject: win-unix convertion...
Marcel van der Boom <[email protected]>
| Newsgroups | gmane.comp.cms.xaraya.bk-notices |
|---|---|
| Organization | Xaraya |
| Message-ID | <[email protected]> |
I prefer the following: - if QA trigger compains and you are sure the file is ok, push with -EBK_RUNQA=no - I fix the trigger marcel Volodymyr Metenchuk wrote: > Marcel, thanks. > > It seems trigger use some old information/data about this file. > When I copy this file to new one with the new name > or delete file and recreate one with the same name - > it can be pushed without problem. > > Delete file and create one again - bad idea of course, > but if this file history is insignificant could we do it? > > voll > > Marcel van der Boom wrote: > >> Voll, i've seen this happen once or twice. I have no clue what it is. >> >> Volodymyr Metenchuk wrote: >> >>> Carl thank you, but the problem not in the dos2unix converting. >>> >>> File is correct (doesn't have any windows CRLF) but >>> pre-appy.qa trigger deny to push it. >>> >>> voll >>> >>> Carl P. Corliss wrote: >>> >>>> Volodymyr Metenchuk wrote: >>>> >>>>> Very strange issue with files in xproject repo. >>>>> I work at Fedora box. >>>>> >>>>> I saw before editing that files are with windows CR. >>>>> I converted it by dos2unix and tried to push, >>>>> but can't do it because BK complains about windows CR! >>>>> >>>>> This script >>>>> >>>>> wincr=`echo -en '\r\n'` >>>>> grep -ce "$wincr" xarnewfuncs.php >>>>> >>>>> return 0, >>>>> so it likes all are working, >>>>> but anyway BK don't allow push me >>>>> >>>>> voll >>>>> >>>>> Volodymyr Metenchuk wrote: >>>>> >>>>>> Changes were applied by voll to modules/xproject level 20. >>>>>> The following cset was applied: >>>>>> ChangeSet >>>>>> 1.299 05/02/24 23:43:22 voll-/[email protected] +1 -0 >>>>>> win-unix convertion >>>>>> xarnewfuncs.php >>>>>> 1.10 05/02/24 23:41:41 voll-/[email protected] +1 -1 >>>>>> win-unix convertion >>>>>> Links for the differences: >>>>>> http://xaraya.com:15000/modules/xproject/[email protected] >>>> >>>> >>>> >>>> >>>> >>>> try something like: >>>> >>>> bk sfiles -g | grep php$ | xargs -i perl -pi -e 's/\r\n/\n/g' {} >>>> >>>> -- >>>> Carl