c2c-oerpscenario team mailing list archive

["Olivier Dony \(OpenERP\)" <722612@xxxxxxxxxxxxxxxxxx>]

Hello Thibaut,

As you've probably seen on the mailing-list, there is not clear
automated merge path between 5.0 and 6.0, and each committer is
responsible for merge 5.0 changes in 6.0 directly.

I think what happened is that your changes were done after the 6.0
branch was created. There was a moment where one of our teams was
working on updating screenshots for 6.0 and it was not advertised yet.
Of course you could not have known at the time of your change that you
needed to take care of the manual merge.

I have just done a cherry-pick copy of your changes in 6.0 at revision
743 odo@xxxxxxxxxxx-20110221151507-82y8p3ry3fhe2bia. Doing a complete
merge of 5.0->6.0 looked a bit hectic, but if anyone feels brave and
want to try it...  ;-)

BTW,  thanks a lot for this contributed section, it is very well written
and very useful for the community indeed :-)

** Changed in: openobject-doc
   Importance: Undecided => Medium

** Changed in: openobject-doc
       Status: New => Fix Released

** Changed in: openobject-doc
     Assignee: (unassigned) => Olivier Dony (OpenERP) (odo)

-- 
You received this bug notification because you are a member of C2C
OERPScenario, which is subscribed to the OpenERP Project Group.
https://bugs.launchpad.net/bugs/722612

Title:
  "Specify view to use" removed in v6

Status in OpenERP Documentation:
  Fix Released

Bug description:
  Hi,

  I just saw that the page I wrote some time ago disappeared in the v6
  doc:
  http://doc.openerp.com/v5.0/developer/2_6_views_events/views/specify_view_to_use.html
  . I don't know why, maybe a merge error ? Else, tell me why :-)