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 71233 - [50cat] REGRESSION: Merging changes from branch does not include folders created on a branch
Summary: [50cat] REGRESSION: Merging changes from branch does not include folders crea...
Status: VERIFIED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 5.x
Hardware: PC Windows XP
: P1 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords: SIMPLEFIX
Depends on:
Blocks:
 
Reported: 2006-01-10 13:06 UTC by misterm
Modified: 2007-01-04 17:14 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Fix (1.08 KB, patch)
2006-01-10 14:18 UTC, _ pkuzel 		Details | Diff
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 misterm 2006-01-10 13:06:04 UTC 
[ BUILD # : 20051218 ]
[ JDK VERSION : 1.4.2_xx ]

Steps to reproduce:

1. Create a branch, e.g, SAMPLE_BRANCH;
2. Create a new folder in the branch, e.g., test_folder;
3. Create a file inside the folder, e.g., test.txt;
4. Commit all changes;
5. Switch to trunk;
6. Merge changes from SAMPLE_BRANCH.

test_folder is not created. This can lead to serious data loss and used to work in previous NB versions, therefore is a P1 issue.
Comment 1 Maros Sandor 2006-01-10 13:44:36 UTC 
Merge command did not create missing directories.

/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergeBranchAction.java,v
 <--  MergeBranchAction.java
new revision: 1.18; previous revision: 1.17
Comment 2 misterm 2006-01-10 13:49:56 UTC 
Shouldn't this be backported to 5.0, since this issue basically renders Merge 
Changes from Branch unusable?
Comment 3 _ pkuzel 2006-01-10 14:18:42 UTC 
Created attachment 28334 [details]
Fix
Comment 4 _ pkuzel 2006-01-10 14:20:18 UTC 
I reviewed the fix. It is correct, trivial and backportable.
Comment 5 Peter Pis 2006-01-10 15:31:51 UTC 
Verified in Build 200601091900 with patch.
Comment 6 Maros Sandor 2006-01-10 17:47:52 UTC 
Integrated into release50.

/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergeBranchAction.java,v
 <--  MergeBranchAction.java
new revision: 1.17.4.1; previous revision: 1.17
Comment 7 Peter Pis 2006-08-09 15:33:52 UTC 
Verified.