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 64407

Summary:	Merge dialog uses incorrect values
Product:	versioncontrol	Reporter:	Peter Pis <ppis>
Component:	CVS	Assignee:	issues@versioncontrol <issues>
Status:	VERIFIED FIXED
Severity:	blocker	Keywords:	SIMPLEFIX
Priority:	P3
Version:	5.x
Hardware:	All
OS:	All
Issue Type:	DEFECT	Exception Reporter:

Description Peter Pis 2005-09-15 09:52:22 UTC

Product Version       = NetBeans IDE Dev (Build 200509141800)
Operating System      = Windows XP version 5.1 running on x86
Java; VM; Vendor      = 1.5.0_04; Java HotSpot(TM) Client VM 1.5.0_04-b05; Sun
Microsystems Inc.
Java Home             = d:\Java\jdk1.5.0_04\jre

Steps:
1. Check out sources, open project.
2. Create new branch for the project and switch all project sources to this branch.
3. Make some changes to the sources, save and commit them.
4. Select project root and invoke "CVS | Merge Changes from Branch ..."

There is problem in this dialog:
  * Current working branch contains extra T letter in front of the branch name

Comment 1 _ pkuzel 2005-09-15 14:39:53 UTC

Checking in libsrc/org/netbeans/lib/cvsclient/admin/AdminHandler.java;
/cvs/javacvs/libsrc/org/netbeans/lib/cvsclient/admin/AdminHandler.java,v  <-- 
AdminHandler.java
new revision: 1.17; previous revision: 1.16
done
Checking in
cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergeBranchPanel.java;
/cvs/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergeBranchPanel.java,v
 <--  MergeBranchPanel.java
new revision: 1.8; previous revision: 1.7
done

Comment 2 Peter Pis 2005-09-16 13:48:25 UTC

Verified.