This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 149915

Summary: SVN 1.5 merge tracking features.
Product: versioncontrol Reporter: Peter Pis <ppis>
Component: SubversionAssignee: issues@versioncontrol <issues>
Status: NEW ---    
Severity: blocker CC: athompson
Priority: P3    
Version: 6.x   
Hardware: All   
OS: All   
Issue Type: ENHANCEMENT Exception Reporter:
Bug Depends on: 225355    
Bug Blocks:    

Description Peter Pis 2008-10-13 09:25:54 UTC
Reconsider integration of svn merge tracking.

http://subversion.tigris.org/merge-tracking/
Comment 1 athompson 2011-08-21 08:43:10 UTC
This is a "must-have" feature.  Any change of this getting done for 7.1?
Comment 2 Ondrej Vrabec 2011-09-19 12:58:36 UTC
I looked at some docs about merge-tracking, but i am not any wiser than before. From what is written e.g. in http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-showlog.html#tsvn-dug-showlog-mergetrack i came to a conclusion that we're missing only the ability to display/mark revisions that are already merged into the current branch/trunk (both in search history and in revision pickers in merge dialog), plus some minor use cases. Could you please name the requested features (in the order of importance) and describe them a bit to let us know what you're missing actually (best with the link to the tortoise UG)? Thanks a lot
Comment 3 athompson 2011-10-07 15:23:13 UTC
Really, the only thing that's needed (IMO) is the ability to (re)merge from a branch without having to select  the revisions to merge.  SVN remembers which revisions have already been merged from that branch and will just merge revisions since then.