[jira] Subscription: Design & Best Practices

2012-03-01 Thread jira
Issue Subscription Filter: Design & Best Practices (24 issues) Subscriber: mavendevlist Key Summary MNG-2184Possible problem with @aggregator and forked lifecycles https://jira.codehaus.org/browse/MNG-2184 MNG-612 implement conflict resolution techniques

Re: GIT DIFF

2012-03-01 Thread Chris Graham
On Fri, Mar 2, 2012 at 10:10 AM, Barrie Treloar wrote: > So that means your working copy reflects what stream you pulled down > from the server. > And the only way to switch that work is to contact the server again. > DVCS has the version control files for everything locally, so you can > work di

Re: GIT DIFF

2012-03-01 Thread Chris Graham
:-) A true DVCS, no. Does it share many of the same constructs etc, as a true DVCS? Yes. In many ways, the fact that the 'local repo' is actually a server side logical construct, is pretty much irrevalent. Jazz SCM is only a small part of the overall Jazz platform. Once you start considering t

Re: Modifying the site lifecycle

2012-03-01 Thread Benson Margulies
On Thu, Mar 1, 2012 at 6:17 PM, Hervé BOUTEMY wrote: > if you look at committer environment [1], you'll see that there is a > subversion configuration with precisely svn-eol-style.txt > That's the default properties developer's svn client sets on files: here is > the > way properties are defined

Maven site and CMS/svnpubsub

2012-03-01 Thread Hervé BOUTEMY
as you may have remarked from some "little" commit logs, Joe put a test site for CMS+svnpubsub of Maven site online [1], with a full CMS integration of site build using Maven (thank you Joe) What was done to adapt the site to the CMS integration is quickly documented in CMS adoption page [2]

Re: Modifying the site lifecycle

2012-03-01 Thread Hervé BOUTEMY
if you look at committer environment [1], you'll see that there is a subversion configuration with precisely svn-eol-style.txt That's the default properties developer's svn client sets on files: here is the way properties are defined when adding a file to svn, even if SCM API doesn't tell anythi

Re: GIT DIFF

2012-03-01 Thread Barrie Treloar
On Thu, Mar 1, 2012 at 6:58 PM, Chris Graham wrote: > "It is then your choice when you want to update your working copy with the > changes you just fetched." > > :-) That would be the merge then. > > Git pull = fetch + merge. > > Interestingly enough, Jazz doesn't let you do that; in that is does

Re: MRELEASE-743 mvn release:prepare fails for hierarchical multi-module project on Windows 7 using msysgit with "is outside repository"

2012-03-01 Thread Robert Scholte
Done, https://jira.codehaus.org/browse/SCM-667 -Robert Op Thu, 01 Mar 2012 11:54:52 +0100 schreef Mirko Friedenhagen : Hello, would anybody with the appropriate permissions be perhaps so kind to move https://jira.codehaus.org/browse/MRELEASE-743 to the SCM project, component maven-scm-prov

maven-scm-provider-jazz

2012-03-01 Thread Chris Graham
I do believe, is complete. I'll send it to the guys who started it, for review. Then I'll open two issues and submit the appropriate patches + binaries to commit. One for the release plugin and the main one for the SCM bit. Then I'll look at extra doco and TCK tests. -Chris, who's headed off

Re: GIT DIFF

2012-03-01 Thread Benjamin Hanzelmann
I found http://www.ndpsoftware.com/git-cheatsheet.html useful as an overview for what's going from/to where in git. Ben On 01.03.2012 05:36, Chris Graham wrote: > That's wierdly worded. > > So, a fetch updates your local repo with that of a remote repo, but > NOT your local working copy? And a p

Re: GIT DIFF

2012-03-01 Thread Chris Graham
"It is then your choice when you want to update your working copy with the changes you just fetched." :-) That would be the merge then. Git pull = fetch + merge. Interestingly enough, Jazz doesn't let you do that; in that is does not separate the fetch and merge. When you accept from another St

Re: Intent to release Doxia and Site Plugin

2012-03-01 Thread Simone Tripodi
There were a couple of strange behavior I noticed while developing the fluido skin, I will be much more than pleased to provide my feedbacks during the RC. Thanks for the hard work, all the best! -Simo http://people.apache.org/~simonetripodi/ http://simonetripodi.livejournal.com/ http://twitter.