#3236: Support for a merge change type in version control API
----------------------------------------------+-----------------------------
Reporter: [EMAIL PROTECTED] | Owner: cmlenz
Type: enhancement | Status: new
Priority: normal | Milestone:
Component: version control | Version: devel
Severity: normal | Resolution:
Keywords: |
----------------------------------------------+-----------------------------
Comment (by [EMAIL PROTECTED]):
This could be implemented by adding a new ''merge'' type to the
`Changeset` class at source:trunk/trac/versioncontrol/[EMAIL PROTECTED] and
modifying the `Changeset.get_changes()` method to yield `(path, kind,
change, integrations)` tuples where `integrations` is a list of
`(base_path, base_rev, merge_type)` tuples and `merge_type` is one of
''copy'', ''ignore'', ''merge'', ''edit'' or ''delete''.
--
Ticket URL: <http://projects.edgewall.com/trac/ticket/3236>
The Trac Project <http://trac.edgewall.com/>
_______________________________________________
Trac-Tickets mailing list
[email protected]
http://lists.edgewall.com/mailman/listinfo/trac-tickets
