According to the logs, I did the last merge on Sep 13, 2005:
Merged rev range 225819:280410 from trunk to roller_2.0 branch
When I did a merge this morning, here's all I saw:
svn merge -r 280410:327195
https://svn.apache.org/repos/asf/incubator/roller/trunk
D STATUS.txt
U src/org/roller/presentation/website/actions/ThemeEditorAction.java
C web/themes/werner/Weblog.vm
C web/WEB-INF/classes/ApplicationResources.properties
C web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
U web/WEB-INF/classes/ApplicationResources_de.properties
C web/theme/footer.jsp
Am I missing something, or is that really the sum total of the trunk
changes that need merging from trunk->roller_2.0?
- Dave
