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.
Summary: | merge doesn't work - wrong target is picked up on 6.7, works fine on 6.5 | ||
---|---|---|---|
Product: | versioncontrol | Reporter: | Masaki Katakai <masaki> |
Component: | Subversion | Assignee: | issues@versioncontrol <issues> |
Status: | VERIFIED FIXED | ||
Severity: | blocker | ||
Priority: | P2 | ||
Version: | 6.x | ||
Hardware: | All | ||
OS: | All | ||
Issue Type: | DEFECT | Exception Reporter: | |
Attachments: | screenshot - merge window |
Description
Masaki Katakai
2009-05-19 11:49:51 UTC
Created attachment 82377 [details]
screenshot - merge window
fixing: cdev #3806b9654e8f BTW, thanks for revealing this bug before the release. A similar issue was fixed in 'switch to' action, but the merge action somehow avoided our notice. Please verify the fix Integrated into 'main-golden', will be available in build *200905200201* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/3806b9654e8f User: Ondrej Vrabec <ovrabec@netbeans.org> Log: #165479 - merge doesn't work - wrong target is picked up on 6.7, works fine on 6.5 replace the last segment in the file url only for multi-file DOs Thank you Ondrej! I verified the fix on build 200905200201. verified. |