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 31910 - Conflict resolver loses data
Summary: Conflict resolver loses data
Status: VERIFIED FIXED
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: -S1S-
Hardware: All All
: P1 blocker (vote)
Assignee: Richard Gregor
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-03-11 20:12 UTC by Peter Liu
Modified: 2003-06-09 14:37 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 Peter Liu 2003-03-11 20:12:24 UTC 
I am trying to resolve conflict between the
following two XML documents:


<?xml version="1.0" encoding="UTF-8"?>
<weblogic-ejb-jar>
  <weblogic-enterprise-bean>
    <ejb-name>Session1</ejb-name>
    <stateless-session-descriptor/>
    <transaction-descriptor/>
  
<enable-call-by-reference>True</enable-call-by-reference>
    <jndi-name>Session1</jndi-name>
    <local-jndi-name>foobar</local-jndi-name>  
<==conflict
  </weblogic-enterprise-bean>
</weblogic-ejb-jar>


<?xml version="1.0" encoding="UTF-8"?>
<weblogic-ejb-jar>
  <weblogic-enterprise-bean>
    <ejb-name>Session1</ejb-name>
    <stateless-session-descriptor/>
    <transaction-descriptor/>
  
<enable-call-by-reference>True</enable-call-by-reference>
    <jndi-name>Session1</jndi-name>
    <local-jndi-name>barfoo </local-jndi-name>  
<==conflict
  </weblogic-enterprise-bean>
</weblogic-ejb-jar>


Using the resolver, I accepted the first version.
After saving the result document, the line after
the conflict disappeared. 

<?xml version="1.0" encoding="UTF-8"?>
<weblogic-ejb-jar>
  <weblogic-enterprise-bean>
    <ejb-name>Session1</ejb-name>
    <stateless-session-descriptor/>
    <transaction-descriptor/>
  
<enable-call-by-reference>True</enable-call-by-reference>
    <jndi-name>Session1</jndi-name>
    <local-jndi-name>foobar</local-jndi-name>    
                                                 
                                     
                                      <== MISSING!!!
</weblogic-ejb-jar>

Note that in the UI, the result document does show
the missing line so something went wrong before or
during the save.
Comment 1 Jiri Kovalsky 2003-03-12 15:28:06 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.
Comment 2 Richard Gregor 2003-03-13 07:36:37 UTC 
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
Comment 3 Richard Gregor 2003-03-13 07:42:55 UTC 
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
Comment 4 Richard Gregor 2003-03-13 12:55:14 UTC 
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
Comment 5 dmladek 2003-06-09 14:37:21 UTC 
OK in NB35 #200306022350