opensand team mailing list archive

[Julien BERNARD <jbernard@xxxxxxxxxxxxxxxxxxx>]

Andy,

I understand now why your diff is incomplete, it is due to the error 
with the pcap file that broke the command.

I is quite surprising that your bzr st returns removal on aal5_atm.pcap 
files while originally there name is atm_aal5.pcap and this is the 
source of your problem.
To resolve your problem:
 - create a backup of your opensand-trunk directory, if something goes 
wrong you will still have your work,
 - write the following commands:
bzr revert opensand-core/src/common/tests/icmp_28/*
bzr revert opensand-core/src/common/tests/icmp_64/*
bzr mv opensand-core/src/common/tests/icmp_28/atm_aal5.pcap 
opensand-core/src/common/tests/icmp_28/aal5_atm.pcap
bzr mv opensand-core/src/common/tests/icmp_64/atm_aal5.pcap 
opensand-core/src/common/tests/icmp_64/aal5_atm.pcap

If this don't work we will try something else.

Additionally you should have kept the history of Atm.cpp and Atm.h files 
through renaming. You can still do that with the following commands:
$ mv  opensand-plugins/atm/src/Aal5Atm.cpp{,bkp}
$ mv opensand-plugins/atm/src/Aal5Atm.h{,bkp}
$ bzr mv opensand-plugins/atm/src/Atm.cpp 
opensand-plugins/atm/src/Aal5Atm.cpp
$ bzr mv opensand-plugins/atm/src/Atm.h opensand-plugins/atm/src/Aal5Atm.h
$ cp opensand-plugins/atm/src/Aal5Atm.cpp{.bkp,}
$ cp opensand-plugins/atm/src/Aal5Atm.h{.bkp,}
This will keep your new files, rename the versionned one and then 
overwrite them with the modified ones.

Regards,

--
Julien BERNARD