On Tue, Mar 29, 2011 at 4:05 PM, ant elder <[email protected]> wrote: > There is something quite weird going on with this group of commits you > just did, the svn history and diffs is all mixed up so you can't see > whats going on, eg see this file which is a pom.xml turning into a > java class. > > Did you do anything out of the ordinary with the commits? > > ...ant
Basically git branch, commit, commit, git merge trunk... The following seems very strange... > > tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/extensibility/NodeActivator.java > - copied, changed from r1086614, > tuscany/sca-java-2.x/trunk/modules/node-api/pom.xml > > tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/extensibility/NodeActivatorExtensionPoint.java > - copied, changed from r1086614, > tuscany/sca-java-2.x/trunk/modules/node-api/pom.xml > > tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/extensibility/NodeExtension.java > - copied, changed from r1086614, > tuscany/sca-java-2.x/trunk/modules/node-api/pom.xml But it seems that the files are ok in trunk. -- Luciano Resende http://people.apache.org/~lresende http://twitter.com/lresende1975 http://lresende.blogspot.com/
