openerp-community team mailing list archive

[Stefan <stefan@xxxxxxxx>]

Hi,

here is a status update on the migration of OCB 7.0 to github, as 
discussed in an informal meeting of several OCB contributors on the 
OpenDays 2014.

I've adapted our replay script[1] to port OCB-specific revisions to 
Github Odoo/7.0. See [2] for the results of this script applied to 
addons and web. It does not work well for the server project, because of 
that one unfortunate push of rs-ocb to the OCB server project, but I 
think the server changes might just as well be sorted out manually and 
submitted in one big pull request. I already tried that out and it is 
not that much work.

BTW. Alexandre Fayolle suggested the option of pushing *all* changes 
into separate branches, and then process the pull requests manually but 
that seems more work in the script as well as in the manual processing 
afterwards so I decided to try the incremental replay first.

Attached you find the output of the script. It will tell you that of the 
146 changes, there are 49 that give conflicts and should be processed in 
some other way. I'm thinking that maybe we can proceed with this unified 
branch and process the conflicting revisions in some other way. A large 
part of the conflicts should be caused by an existing fix in Odoo, I'm 
guessing.

It would be great if someone could do some rough validation to see if 
the process seems sound. If that has been verified, we could tag all the 
conflicting revisions and see if it is worthwhile just to pick up the 
remaining ones manually, after weeding out the duplicate fixes.

In case someone wants to reproduce the results, it is a matter of running

  ocb2git.py ocb-addons openobject-addons odoo
  ocb2git.py ocb-web openerp-web odoo

All the arguments are local bzr and git branches.

Cheers,
Stefan

[1] 
http://bazaar.launchpad.net/~therp-nl/lp-community-utils/replay_ocb2git/view/head:/ocb2git.py
[2] https://github.com/StefanRijnhart/odoo/tree/test-replay

--
Therp - Maatwerk in open ontwikkeling

Stefan Rijnhart - Ontwerp en implementatie

mail: stefan@xxxxxxxx
tel: +31 (0) 614478606
web: http://therp.nl

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8696
  fixes https://launchpad.net/bugs/1113418
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8713
  fixes https://launchpad.net/bugs/1094285
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8752
  fixes https://launchpad.net/bugs/1101811
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8762
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8784

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8819
  fixes https://launchpad.net/bugs/1135873
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8897
  fixes https://launchpad.net/bugs/1155624
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8898
  fixes https://launchpad.net/bugs/1155581

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8932
  fixes https://launchpad.net/bugs/1102078
  fixes https://launchpad.net/bugs/1154533

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8973
  fixes https://launchpad.net/bugs/1023047
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/8974

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9064
  fixes https://launchpad.net/bugs/1132963

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9121
  fixes https://launchpad.net/bugs/1177348
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9179
  fixes https://launchpad.net/bugs/971713
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9180
  fixes https://launchpad.net/bugs/941817

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9181
  fixes https://launchpad.net/bugs/1168948

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9182
  fixes https://launchpad.net/bugs/1180803

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9197
  fixes https://launchpad.net/bugs/1100427

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9198

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9210
  fixes https://launchpad.net/bugs/1182111
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9211
  fixes https://launchpad.net/bugs/1088412

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9212
  fixes https://launchpad.net/bugs/1156593
  fixes https://launchpad.net/bugs/1112580

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9213

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9214
  fixes https://launchpad.net/bugs/1168603

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9215

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9216
  fixes https://launchpad.net/bugs/1170916
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9217
  fixes https://launchpad.net/bugs/1186146

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9272
  fixes https://launchpad.net/bugs/1178623
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9273
  fixes https://launchpad.net/bugs/1188528
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9274

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9275
  fixes https://launchpad.net/bugs/1184610
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9276
  fixes https://launchpad.net/bugs/1180773
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9280
  fixes https://launchpad.net/bugs/1155569

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9296
  fixes https://launchpad.net/bugs/1188593
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9312
  fixes https://launchpad.net/bugs/1192195
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9341
  fixes https://launchpad.net/bugs/1168398
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9363
  fixes https://launchpad.net/bugs/1025703
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9364
  fixes https://launchpad.net/bugs/1178617

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9367
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9397
  fixes https://launchpad.net/bugs/1084822

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9398
  fixes https://launchpad.net/bugs/1070418

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9405
  fixes https://launchpad.net/bugs/1183741
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9406
  fixes https://launchpad.net/bugs/1067541

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9433
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9434
  fixes https://launchpad.net/bugs/1146923

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9435

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9452
  fixes https://launchpad.net/bugs/1190259

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9453
  fixes https://launchpad.net/bugs/1190934

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9454

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9455
  fixes https://launchpad.net/bugs/1207375

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9459
  fixes https://launchpad.net/bugs/1103072

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9472
  fixes https://launchpad.net/bugs/1156215
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9474
  fixes https://launchpad.net/bugs/1206403

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9475

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9476
  fixes https://launchpad.net/bugs/1217146
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9569

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9570
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9578
  fixes https://launchpad.net/bugs/1208456

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9579
  fixes https://launchpad.net/bugs/1108228

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9580
  fixes https://launchpad.net/bugs/1177063
  fixes https://launchpad.net/bugs/1177076
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9581
  fixes https://launchpad.net/bugs/1220665

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9584
  fixes https://launchpad.net/bugs/1238525
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9598
  fixes https://launchpad.net/bugs/1238508
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9599
  fixes https://launchpad.net/bugs/1220732

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9613
  fixes https://launchpad.net/bugs/1204224
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9617
  fixes https://launchpad.net/bugs/1195904
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9623

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9624
  fixes https://launchpad.net/bugs/1163832

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9625
  fixes https://launchpad.net/bugs/1103072

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9626
  fixes https://launchpad.net/bugs/1237512

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9627
  fixes https://launchpad.net/bugs/754339
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9628
  fixes https://launchpad.net/bugs/1220716
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9629
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9640
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9649
  fixes https://launchpad.net/bugs/1104559
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9666

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9729
  fixes https://launchpad.net/bugs/1191036

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9730
  fixes https://launchpad.net/bugs/1206538

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9731
  fixes https://launchpad.net/bugs/1249600

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9732

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9733
  fixes https://launchpad.net/bugs/1083077

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9734
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9815

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9816
  fixes https://launchpad.net/bugs/1262265
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9833
  fixes https://launchpad.net/bugs/1215897

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9841
  fixes https://launchpad.net/bugs/1237832

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9863
  fixes https://launchpad.net/bugs/1198250

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9864

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9865
  fixes https://launchpad.net/bugs/1264950

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9890
  fixes https://launchpad.net/bugs/1181291

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9919
  fixes https://launchpad.net/bugs/1199858

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9940
  fixes https://launchpad.net/bugs/1281492

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9943
  fixes https://launchpad.net/bugs/1267495

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9947
  fixes https://launchpad.net/bugs/1281687
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9952
  fixes https://launchpad.net/bugs/1281558
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9956

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9957

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9958

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9959
  fixes https://launchpad.net/bugs/1268594
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9986
  fixes https://launchpad.net/bugs/1259971

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9987
  fixes https://launchpad.net/bugs/1235255

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9994
  fixes https://launchpad.net/bugs/1281579

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10000
  fixes https://launchpad.net/bugs/1278078

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10001
  fixes https://launchpad.net/bugs/1250053

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10002

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10008
  fixes https://launchpad.net/bugs/1234678

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10009
  fixes https://launchpad.net/bugs/1091268

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10010
  fixes https://launchpad.net/bugs/1260778

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10011
  fixes https://launchpad.net/bugs/1188629

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10012
  fixes https://launchpad.net/bugs/1201472

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10025
  fixes https://launchpad.net/bugs/1292358

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10037
  fixes https://launchpad.net/bugs/1190592
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10038
  fixes https://launchpad.net/bugs/1137541

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10039
  fixes https://launchpad.net/bugs/1229646

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10050
  fixes https://launchpad.net/bugs/1292587

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10059
  fixes https://launchpad.net/bugs/1292245
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10077
  fixes https://launchpad.net/bugs/1244183

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10083
  fixes https://launchpad.net/bugs/1174160

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10084
  fixes https://launchpad.net/bugs/1291903

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10085
  fixes https://launchpad.net/bugs/1079548

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10128
  fixes https://launchpad.net/bugs/1308364

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10129
  fixes https://launchpad.net/bugs/1311004
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10130
  fixes https://launchpad.net/bugs/1281290

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10141
  fixes https://launchpad.net/bugs/1098557

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10142
  fixes https://launchpad.net/bugs/1291986

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10143
  fixes https://launchpad.net/bugs/1192115
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10144
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10145

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10163

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10164

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10178
  fixes https://launchpad.net/bugs/1087033

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10179

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10194
  fixes https://launchpad.net/bugs/1319109
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10195
  fixes https://launchpad.net/bugs/1290820
  fixes https://launchpad.net/bugs/1319095
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10202
  fixes https://launchpad.net/bugs/1315367

Committing http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/10204
  fixes https://launchpad.net/bugs/1312045

Committing http://bazaar.launchpad.net/~ocb/ocb-web/7.0/revision/3874
  fixes https://launchpad.net/bugs/1157102
  fixes https://launchpad.net/bugs/115710
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-web/7.0/revision/3914
  fixes https://launchpad.net/bugs/1119289

Committing http://bazaar.launchpad.net/~ocb/ocb-web/7.0/revision/3922
  fixes https://launchpad.net/bugs/1119289

Committing http://bazaar.launchpad.net/~ocb/ocb-web/7.0/revision/3939
  fixes https://launchpad.net/bugs/1013636

Committing http://bazaar.launchpad.net/~ocb/ocb-web/7.0/revision/4040

Committing http://bazaar.launchpad.net/~ocb/ocb-web/7.0/revision/4128
Patch failed, reverting

Committing http://bazaar.launchpad.net/~ocb/ocb-web/7.0/revision/4156
  fixes https://launchpad.net/bugs/1279885

Committing http://bazaar.launchpad.net/~ocb/ocb-web/7.0/revision/4170
  fixes https://launchpad.net/bugs/1167429

Committing http://bazaar.launchpad.net/~ocb/ocb-web/7.0/revision/4193
  fixes https://launchpad.net/bugs/1190236

Committing http://bazaar.launchpad.net/~ocb/ocb-web/7.0/revision/4197
  fixes https://launchpad.net/bugs/1261332