#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 | Keywords:
----------------------------------------------+-----------------------------
Trac currently supports ''add'', ''edit'', ''delete'', ''copy'' and
''move'' change types for files in a changeset. However, it would also be
nice if Trac supported some of the ''merge'' change type for changes that
involve merging changes from other files.
I realise that Subversion doesn't currently implement merge tracking
natively (''yet''), but I have been working on a [http://www.perforce.com/
Perforce] plugin for Trac (similar to the one described in #257 but based
on [http://pyperforce.sourceforge.net/ PyPerforce]) and would like to be
able to get Perforce's merge/integration information displayed through
Trac.
Perforce supports a number of different merge/integration types:
* '''branch from''' - An exact copy of a file to a new location.
Equivalent to Trac's ''copy'' or ''move'' depending on whether the source
file was also deleted in the same changeset.
* '''add from''' - A copy of a file to a new location that has been
modified before checkin (related to #3172).
* '''copy from''' - A merge operation that ignores any changes in the
target file, effectively replacing the target with the source.
* '''ignore from''' - A merge operation that ignores any changes in the
source file, keeping the target file's changes.
* '''merge from''' - A merge operation that merges the changes from both
source and target files.
* '''edit from''' - A merge operation that merges the changes from both
source and target files and contains original user edits.
* '''delete from''' - A merge of a deleted source file into the target
file, deleting the target file. Basically a delete operation with an
associated source file.
See the
[http://www.perforce.com/perforce/doc.052/manuals/cmdref/integrated.html#1040665
p4 integrated] documentation for more info on the Perforce integration
model.
--
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
