Hi Stefan, Thanks for your reply, maybe I have worked on a windows disk mounted to Ubuntu. I will create another branch and propose merging again.
I will delete this branch later. Wish you a Merry Christmas! Best regards, Tien Tran. > Hi Tien, > > the diff is mangled because of changes in the file mode of all or many files > in the repository. Did you work with the branch on a filesystem that does not > support such file modes or has to make assumptions about them? [1] indicates > that the problem occurs in situations where a Windows filesystem is mounted on > a Linux system, although there may be other causes as well. > > Could you try again from the default filesystem on your computer system if > that is not what you did? > > Cheers, > Stefan. > > > [1] https://bugs.launchpad.net/bzr/+bug/904950 -- https://code.launchpad.net/~openerp-community/openobject-addons/trunk-gscom-l10n-vn/+merge/141153 Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-addons/trunk-gscom-l10n-vn. _______________________________________________ Mailing list: https://launchpad.net/~openerp-community Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp
