baffled by how merging works
I'm fairly new to svn and I'm trying to get my head around how svn handles branches and merging. I've done a lot of reading on this, I've been able to work my way through merging changes from TRUNK to a BRANCH but I still do not quite understand it. If someone could start by explaining what happens in this scenario that would help. First, I used this command to see the differences between my BRANCH and TRUNK svn diff --summarize --old http://repo/proj/branches/1/ --new http://repo/proj/trunk/ Second, based on the summary, I merged differences from TRUNK into BRANCH and commited the BRANCH. Third, I re-ran the command to see if there were any changes I missed. svn diff --summarize --old http://repo/proj/branches/1/ --new http://repo/proj/trunk/ To my surprise it gave me the same summary. After merging the changes into the BRANCH and committing the changes, I expected there to be no changes. So why does it give me the same summary?
Discrepancy in SNAPSHOT jar filename between JAR Plugin and Assembly Plugin
I am seeing an interesting discrepancy between the JAR plugin and the Assembly plugin. I have the JAR plugin configured to add the dependencies to the MANIFEST: org.apache.maven.plugins maven-jar-plugin true lib org.myapp.main.Main The JAR file name will be added to the MANIFEST like this. . . Class-Path: lib/my-commons-1.0.6-SNAPSHOT.jar [...etc] So far so good. Now, I have the Assembly plugin configured to add the dependencies to the /lib directory of an archive: false /lib true When the Assembly plugin builds the archive, the name of the jarfile is NOT my-commons-1.0.6-SNAPSHOT.jar! Instead what I get is "my-commons-1.0.6-20110810.204640-23.jar" $ ll my-commons* -rwx--+ 1 mike Users Users 48805 Aug 11 08:53 my-commons-1.0.6-20110810.204640-23.jar Major Problem!! Anyone know why this is happening? I am using Maven 2.0.9 and I'm stuck with this version and cannot change it!
