opensand team mailing list archive

[Julien BERNARD <jbernard@xxxxxxxxxxxxxxxxxxx>]

Andy,
> Hi Julien & Didier,
>
> I tried to commit my changes as you suggest but there is an issue 
> which not allows me to complete this operation.
> In attached file you should see results of two operation: commit and 
> checking for differences between my and main branch (I believe that 
> works this way).
>
> Results indicates taht problem lies in the same place which is file 
> located at:
>
> opensand-core/src/common/tests/icmp_28/aal5_atm.pcap
Could you please send us the result of the commands:
  $ bzr st
  $ bzr log | head -n 20
> Due to my actions in area of ATM/ALL5 plugin some files change their 
> names according to expected schema.
> In my opinion this is the first file which names has changed. For some 
> reason bazaar do not accept it.
Did you renamed it using
$ bzr mv atm_aal5.pcap aal5_atm.pcap ?
> This issue is connected directly to my patch file from previous 
> report. In the end of that file you can see the same issue.
>
> I tried to find some clue through bzr tutorials but only thing which 
> seems to make sens is what I have found in our wiki page.
> Any suggestions in this matter??
>
> Buy the way there is small error in a text in following command:
>
>  bzr commit --fixed lp:1051711 --file commit_1051711
>
>
> Word "fixed" should be replaced to "fixes". Example is in the attached 
> file.
Thank you, I update the wiki right now.
> Regards,
>
> Andy
>
>
> P.S> There is one more information in attached log which makes me 
> curious:
>
> Committing to: /home/andygorski/opensand-trunk/
>
> In my opinion it should be "Committing from" but maybe i miss something.
No it's ok, that means that you commit in your local branch that is 
"/home/andygorski/opensand-trunk".

I have a problem with your bzr diff command as it only returns changes 
on the files opensand-core/conf/conf/core_global.conf and 
opensand-core/conf/xsd/core_global.xsd. Did you already commit some 
modifications ?

Regards,

--
Julien BERNARD