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: | Conflict resolver loses data | ||
---|---|---|---|
Product: | utilities | Reporter: | Peter Liu <petertliu> |
Component: | Diff | Assignee: | Richard Gregor <rgregor> |
Status: | VERIFIED FIXED | ||
Severity: | blocker | CC: | ppisl |
Priority: | P1 | ||
Version: | -S1S- | ||
Hardware: | All | ||
OS: | All | ||
Issue Type: | DEFECT | Exception Reporter: |
Description
Peter Liu
2003-03-11 20:12:24 UTC
Yes, that's true ! Here is the procedure how to reproduce the bug: 1. Have two different working dirs A and B against same CVS repository. 2. Create new dialog in A. "Add" and "Commit" it. 3. Check it out into B. Double click and set the title property to "aaa", save all, commit. 4. Double click the dialog in A. Set the title property to "bbb", save all and "Update" it. 5. Node becomes [Merge Conflicts]. Invoke "Resolve Conflicts".6. Select .form tab and "Accept" one solution. Push "OK" and "Yes" buttons. 7. New .form file will get invalid. Fixed. This issue was originated as side effect of fix#31300. However the issue 31300 occured again as isuue 31965. Checking in src/org/netbeans/modules/merge/builtin/visualizer/MergeControl.java;/cvs/diff/src/org/netbeans/modules/merge/builtin/visualizer/MergeControl.java,v <-- MergeControl.java new revision: 1.15; previous revision: 1.14 done Also in release35 branch. Checking in src/org/netbeans/modules/merge/builtin/visualizer/MergeControl.java;/cvs/diff/src/org/netbeans/modules/merge/builtin/visualizer/MergeControl.java,v <-- MergeControl.java new revision: 1.13.2.2; previous revision: 1.13.2.1 done Also in release35-QBE200303112350 Checking in src/org/netbeans/modules/merge/builtin/visualizer/MergeControl.java; /cvs/diff/src/org/netbeans/modules/merge/builtin/visualizer/MergeControl.java,v <-- MergeControl.java new revision: 1.13.2.1.2.1; previous revision: 1.13.2.1 done OK in NB35 #200306022350 |