On Sat, 10 Jun 2006, Mike Perham wrote: > This is a patch against 2.0.x maven-archiver which allows the user to > override the default manifest entries placed by Maven and also cleans > all manifest entries of linebreaks so invalid manifests with linebreaks > are not created. We will also need to push this down to the jar plugin > but do we want to release a jar plugin which requires 2.0.5? Should > this be deferred to 2.1?
Wasn't the line ending stuff fixed in plexus-archiver a long time ago? > > Side note: I don't use Subversion daily - what's the command(s) to merge > a change from the 2.0.x branch to the 2.1 trunk? Usually you should commit on trunk first and then merge with the branch, but technically it doesn't matter. You do: $ cd path/to/branch; $ svn commit; remember revision number: X $ cd path/to/trunk; $ svn merge -rX-1:X https://svn.apache.org/..../branch-2.0.x . (if X = 3000 then it's -r2999:3000) test, and commit, and mention you've merged revision X from trunk to branch so we can do merge tracking. > I need someone else to (hopefully coderead and) commit this as I don't > have commit rights to components. ah, so i've explained this for nothing.. ;) -- Kenney > http://jira.codehaus.org/browse/MJAR-38 > > mike > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > -- Kenney Westerhof http://www.neonics.com GPG public key: http://www.gods.nl/~forge/kenneyw.key --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
