Edgewall Software
Modify

Opened 15 years ago

Last modified 14 years ago

#8477 new enhancement

Support SVN 1.5 merge tracking in Annotate view

Reported by: Javier Sanz <jsceballos@…> Owned by:
Priority: normal Milestone: unscheduled
Component: version control/browser Version: none
Severity: normal Keywords: svn15
Cc: Branch:
Release Notes:
API Changes:
Internal Changes:

Description

Starting with Subversion 1.5, the "svn annotate" command accepts a new option -g [—use-merge-history]. When used, the commands shows, for each line, it's original author, instead of the default behavior of showing the author of the merge operation.

This is possible thanks to the merge tracking capabilities introduced in SVN 1.5, and it is useful in projects which make intensive branching, because otherwise annotate info is progressively lost after successive merges.

Ideally Trac would support this too.

To enable the feature, a new checkbox in the annotate view would be needed, named something like "Include merged revisions" (I took that from Subclipse).

Finally, "svn annotate" also shows the letter "G" prior to each line which has been merged. It would be nice to find some equivalent.

Attachments (0)

Change History (2)

comment:1 by Christian Boos, 15 years ago

Component: version controlversion control/browser
Keywords: svn15 added; svn1.5 removed
Milestone: 0.13

comment:2 by Christian Boos, 14 years ago

Milestone: next-major-0.1Xunscheduled

Modify Ticket

Change Properties
Set your email in Preferences
Action
as new The ticket will remain with no owner.
The ticket will be disowned.
as The resolution will be set. Next status will be 'closed'.
The owner will be changed from (none) to anonymous. Next status will be 'assigned'.

Add Comment


E-mail address and name can be saved in the Preferences .
 
Note: See TracTickets for help on using tickets.