[MERGE] Fix branch history for res_bank*, courtesy of Numerigraphe
authorOlivier Dony <odo@openerp.com>
Tue, 22 Nov 2011 15:15:36 +0000 (16:15 +0100)
committerOlivier Dony <odo@openerp.com>
Tue, 22 Nov 2011 15:15:36 +0000 (16:15 +0100)
commit05883553960990bd2f07a29facceb67405a859f6
treedb6b450a6ffc15d41135a10d7a49169077332367
parent5251a34a6235a2819a1aa8e0aca3d049bf6cbd0b
parenta02e470164c5554f8ed5c240191726fc431d9f47
[MERGE] Fix branch history for res_bank*, courtesy of Numerigraphe

This looks like an addition and a removal of a file,
but it actually removes a file with a broken history,
and restores a new file with the full history, including
the partial history of the removed file.
The net result is a file with an almost correct history.

lp bug: https://launchpad.net/bugs/892054 fixed

bzr revid: odo@openerp.com-20111122151536-90zdagyao6igbm7t