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 76575 - merge dialog labels
Summary: merge dialog labels
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Subversion (show other bugs)
Version: 6.x
Hardware: All All
: P3 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
: 76594 (view as bug list)
Depends on:
Blocks:
 
Reported: 2006-05-18 21:41 UTC by Tomas Stupka
Modified: 2006-10-23 15:47 UTC (History)
1 user (show)

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 Tomas Stupka 2006-05-18 21:41:06 UTC 
Title should be: "Merge into JavaApplication1"
in case f "One repository folder", there should be "Repository Folder" instead
of "First Repository Folder".
use "Starting Revision" and "Ending Revision" instead  of "Starting with
Revision" and "Ending with Revision" in all cases
Comment 1 Peter Pis 2006-05-19 09:17:04 UTC 
*** Issue 76594 has been marked as a duplicate of this issue. ***
Comment 2 Tomas Stupka 2006-05-23 12:15:04 UTC 
fixed

Checking in SinceOriginPreviewPanel.form;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/SinceOriginPreviewPanel.form,v
 <--  SinceOriginPreviewPanel.form
new revision: 1.4; previous revision: 1.3
done
Checking in SinceOriginPreviewPanel.java;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/SinceOriginPreviewPanel.java,v
 <--  SinceOriginPreviewPanel.java
new revision: 1.4; previous revision: 1.3
done
Checking in MergeTwoFoldersPanel.java;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/MergeTwoFoldersPanel.java,v
 <--  MergeTwoFoldersPanel.java
new revision: 1.3; previous revision: 1.2
done
Checking in TwoFoldersPreviewPanel.java;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/TwoFoldersPreviewPanel.java,v
 <--  TwoFoldersPreviewPanel.java
new revision: 1.4; previous revision: 1.3
done
Checking in MergeOneFolderPanel.java;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/MergeOneFolderPanel.java,v
 <--  MergeOneFolderPanel.java
new revision: 1.3; previous revision: 1.2
done
Checking in MergePanel.form;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/MergePanel.form,v
 <--  MergePanel.form
new revision: 1.7; previous revision: 1.6
done
Checking in OneFolderPreviewPanel.form;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/OneFolderPreviewPanel.form,v
 <--  OneFolderPreviewPanel.form
new revision: 1.4; previous revision: 1.3
done
Checking in MergeSinceOriginPanel.java;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/MergeSinceOriginPanel.java,v
 <--  MergeSinceOriginPanel.java
new revision: 1.3; previous revision: 1.2
done
Checking in MergeOneFolderPanel.form;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/MergeOneFolderPanel.form,v
 <--  MergeOneFolderPanel.form
new revision: 1.3; previous revision: 1.2
done
Checking in Merge.java;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/Merge.java,v 
<--  Merge.java
new revision: 1.10; previous revision: 1.9
done
Checking in TwoFoldersPreviewPanel.form;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/TwoFoldersPreviewPanel.form,v
 <--  TwoFoldersPreviewPanel.form
new revision: 1.4; previous revision: 1.3
done
Checking in MergeTwoFoldersPanel.form;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/MergeTwoFoldersPanel.form,v
 <--  MergeTwoFoldersPanel.form
new revision: 1.3; previous revision: 1.2
done
Checking in MergePanel.java;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/MergePanel.java,v
 <--  MergePanel.java
new revision: 1.7; previous revision: 1.6
done
Checking in OneFolderPreviewPanel.java;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/OneFolderPreviewPanel.java,v
 <--  OneFolderPreviewPanel.java
new revision: 1.4; previous revision: 1.3
done
Checking in MergeSinceOriginPanel.form;
/cvs/subversion/main/src/org/netbeans/modules/subversion/ui/copy/MergeSinceOriginPanel.form,v
 <--  MergeSinceOriginPanel.form
new revision: 1.3; previous revision: 1.2
done