Project

General

Profile

Actions

Bug #4670

closed

svn update fails to update module with modifications

Added by Christopher Brooks almost 15 years ago. Updated almost 15 years ago.

Status:
Resolved
Priority:
Immediate
Assignee:
Category:
build system
Target version:
Start date:
01/14/2010
Due date:
% Done:

0%

Estimated time:
Bugzilla-Id:
4670

Description

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

Actions

Also available in: Atom PDF