opensand team mailing list archive

[Jedrzej Gorski <andy.gorski.dev@xxxxxxxxx>]

Julien

Try to do:
> $ bzr rm opensand-core/src/common/tests/icmp_28/aal5_atm.pcap
> $ bzr rm opensand-core/src/common/tests/icmp_64/aal5_atm.pcap
> then the bzr mv commands.
>

I did as you requested but I had to perform some additional actions.
Results are still strange.

andygorski@andygorski-desktop:~/opensand-trunk$ bzr rm
opensand-core/src/common/tests/icmp_28/atm_aal5.pcap
bzr: ERROR: Can't safely remove modified or unknown files:
unknown:
  opensand-core/src/common/tests/icmp_28/atm_aal5.pcap
Use --keep to not delete them, or --force to delete them regardless.

andygorski@andygorski-desktop:~/opensand-trunk$ bzr rm --force
opensand-core/src/common/tests/icmp_28/atm_aal5.pcap
deleted opensand-core/src/common/tests/icmp_28/atm_aal5.pcap
andygorski@andygorski-desktop:~/opensand-trunk$ bzr rm --force
opensand-core/src/common/tests/icmp_64/atm_aal5.pcap
deleted opensand-core/src/common/tests/icmp_64/atm_aal5.pcap

When file where successfully deleted through "bzr rm --force" comand in
order to perform move "bzr mv "I had to restore original "atm_aal5.pcap"
files. I did manually copy from fresh copy of open-sand downloaded from
bazaar into other folder.

andygorski@andygorski-desktop:~/opensand-trunk$ bzr mv
opensand-core/src/common/tests/icmp_28/atm_aal5.pcap
opensand-core/src/common/tests/icmp_28/aal5_atm.pcap
opensand-core/src/common/tests/icmp_28/atm_aal5.pcap =>
opensand-core/src/common/tests/icmp_28/aal5_atm.pcap

andygorski@andygorski-desktop:~/opensand-trunk$ bzr mv
opensand-core/src/common/tests/icmp_64/atm_aal5.pcap
opensand-core/src/common/tests/icmp_64/aal5_atm.pcap
opensand-core/src/common/tests/icmp_64/atm_aal5.pcap =>
opensand-core/src/common/tests/icmp_64/aal5_atm.pcap

But after all results are as follows:

andygorski@andygorski-desktop:~/opensand-trunk$ bzr conflicts
andygorski@andygorski-desktop:~/opensand-trunk$ bzr deleted
opensand-core/src/common/tests/icmp_28/aal5_atm.pcap
opensand-core/src/common/tests/icmp_64/aal5_atm.pcap

Any idea what is wrong ??

Regards,

Andy