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 196575

Summary:	SVN filter
Product:	versioncontrol	Reporter:	alabme
Component:	Subversion	Assignee:	Ondrej Vrabec <ovrabec>
Status:	NEW ---
Severity:	normal
Priority:	P3
Version:	7.0
Hardware:	PC
OS:	Windows 7
Issue Type:	ENHANCEMENT	Exception Reporter:

Description alabme 2011-03-11 09:47:45 UTC

In my work we often do merge between two branches. 
Most of it required that I merge only my files. Netbeans provides this in "Merge Form: On Repository Folder" and it is very nice. But, when i choose "show changes" on merged branch i see not only my files but many others. 
Those files has not changed content at all but they has changed mergeino porperty.

NOW: I need a filter (or search panel) that would allow me to select my files, in "show changes" view, with differing content of those that have a changed property mergeinfo only, so I could do commit in nice and easy way.

Comment 1 Tomas Stupka 2011-03-11 13:28:56 UTC

 hm, a possible workaround for you would be:
open the diff view for a context -> sort by the property column -> multiselect files w/o the mergeinfo prop -> righ-click the selection -> commit

Comment 2 alabme 2011-03-14 07:28:00 UTC

(In reply to comment #1)
>  hm, a possible workaround for you would be:
> open the diff view for a context -> sort by the property column -> multiselect
> files w/o the mergeinfo prop -> righ-click the selection -> commit

Hm, in diff view files are always listed twice, so I would see the same file with mergeinfo property (after) and without it (before), so it does not help at all.