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 170759

Summary:	Merge changes from branch action works recursively
Product:	versioncontrol	Reporter:	mperezma <mperezma>
Component:	CVS	Assignee:	issues@versioncontrol <issues>
Status:	RESOLVED WORKSFORME
Severity:	blocker
Priority:	P3
Version:	6.x
Hardware:	All
OS:	All
Issue Type:	DEFECT	Exception Reporter:

Description mperezma 2009-08-21 22:10:17 UTC

Steps to reproduce:

- Create package aa and add a class NewClass to it.
- Create package aa.bb and add a class NewClass2 to it.
- Branch the project and modify both classes in the branch, then commit changes.
- Switch to trunk and merge changes from branch in package aa.

Expected: Only aa.NewClass merges the changes.

Result: aa.bb.NewClass2 also merges the changes from the branch.

Comment 1 Peter Pis 2009-09-09 09:53:20 UTC

Fixed.

http://hg.netbeans.org/cdev/rev/4607b3db1427

Comment 2 Quality Engineering 2009-09-11 21:55:29 UTC

Integrated into 'main-golden', will be available in build *200909111401* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main-golden/rev/4607b3db1427
User: Peter Pis <ppis@netbeans.org>
Log: #170759: Branch actions doesn't work recursively on flat folders.

Comment 3 mperezma 2011-02-10 23:03:45 UTC

I've reproduced it again in NB7.0beta2
Related bug: #170759

Comment 4 mperezma 2011-02-11 22:28:58 UTC

Please excuse-me for the mistake :( as bug 170758 it still working in NB7.0beta2