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 - Merge changes from branch action works recursively
Summary: Merge changes from branch action works recursively
Status: RESOLVED WORKSFORME
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 6.x
Hardware: All All
: P3 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-08-21 22:10 UTC by mperezma
Modified: 2011-02-11 22:28 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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