Changes between Version 1 and Version 2 of Ticket #5747, comment 22


Ignore:
Timestamp:
Aug 16, 2013, 2:05:24 AM (11 years ago)
Author:
Ryan J Ollos
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #5747, comment 22

    v1 v2  
    1 If no one object, we could merge recent changes on the [browser:/graphvizplugin/branches/1.0] branch back to [browser:/graphvizplugin/trunk]. Future development would then presumably follow the Trac's practice of making bugfixes on the branch and merging them to trunk. For [11263], we could make the change on the branch and do a record-only merge so that we don't get a conflict when merging 1.0 to the trunk.
     1If no one objects (or has a better idea), we could merge recent changes on the [browser:/graphvizplugin/branches/1.0] branch back to [browser:/graphvizplugin/trunk]. Future development would then presumably follow the Trac's practice of making bugfixes on the branch and merging them to trunk. For [11263], we could make the change on the branch and do a record-only merge so that we don't get a conflict when merging 1.0 to the trunk.