Attachment #51598 for bug #102717

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.

View | Details | Raw Unified | Return to bug 102717
Collapse All | Expand All





        try {
            int status = hg.getFileStatusCache().getStatus(srcFile).getStatus();
            if (status == FileInformation.STATUS_NOTVERSIONED_NEWLOCALLY) {
                 status == FileInformation.STATUS_VERSIONED_ADDEDLOCALLY)) {
                srcFile.renameTo(dstFile);
            } else if (status == FileInformation.STATUS_VERSIONED_ADDEDLOCALLY) {
                srcFile.renameTo(dstFile);
                HgCommand.doRemove(root, srcFile);
                HgCommand.doAdd(root, dstFile);
            } else {
                HgCommand.doRename(root, srcFile, dstFile);
            }

Return to bug 102717

Lines 182-190 Link Here

(-)MercurialInterceptor.java (-2 / +5 lines)
182		182
183	try {	183	try {
184	int status = hg.getFileStatusCache().getStatus(srcFile).getStatus();	184	int status = hg.getFileStatusCache().getStatus(srcFile).getStatus();
185	if ((status == FileInformation.STATUS_NOTVERSIONED_NEWLOCALLY \|\|	185	if (status == FileInformation.STATUS_NOTVERSIONED_NEWLOCALLY) {
186	status == FileInformation.STATUS_VERSIONED_ADDEDLOCALLY)) {
187	srcFile.renameTo(dstFile);	186	srcFile.renameTo(dstFile);
		187	} else if (status == FileInformation.STATUS_VERSIONED_ADDEDLOCALLY) {
		188	srcFile.renameTo(dstFile);
		189	HgCommand.doRemove(root, srcFile);
		190	HgCommand.doAdd(root, dstFile);
188	} else {	191	} else {
189	HgCommand.doRename(root, srcFile, dstFile);	192	HgCommand.doRename(root, srcFile, dstFile);
190	}	193	}