[kepler-dev] [Bug 4670] New: svn update fails to update module with modifications

[bugzilla-daemon at ecoinformatics.org]

http://bugzilla.ecoinformatics.org/show_bug.cgi?id=4670

           Summary: svn update fails to update module with modifications
           Product: Kepler
           Version: 1.x dev
          Platform: Other
        OS/Version: MacOS X
            Status: NEW
          Severity: minor
          Priority: P2
         Component: build system
        AssignedTo: berkley at nceas.ucsb.edu
        ReportedBy: cxh at eecs.berkeley.edu
         QAContact: kepler-dev at kepler-project.org


Under Mac OS 10.5, I ran svn update:

[update-modules] Updating ptII...
[update-modules] svn -r head update /Users/cxh/src/kepler/ptII 
[update-modules] At revision 22494.
[update-modules] 
[update-modules] The following classes have been modified in the ptolemy
module:
[update-modules]  
/Users/cxh/src/kepler/ptolemy/ptolemy/vergil/basic/BasicGraphFrame.java
[update-modules]  
/Users/cxh/src/kepler/ptolemy/ptolemy/actor/gui/TableauFrame.java
[update-modules] WARNING: the ptolemy module cannot be updated because of
modifications.

Indeed, BasicGraphFrame and TableauFrame are modified.  I would expect
that the ptII module would get updates including merges from changes.
Not updating the ptII repository makes it difficult to troubleshoot problems.

This is in a tree that was freshly checked out today and in which I had done
 ant update-ptolemy -Drev=head

-- 
Configure bugmail: http://bugzilla.ecoinformatics.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.