Re: GIT DIFF

2012-02-29 Thread Barrie Treloar
On Thu, Mar 1, 2012 at 3:06 PM, 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 pull does the merge as well, which is remote -> local > working copy? > > Terminology is rather important  h

Re: GIT DIFF

2012-02-29 Thread Chris Graham
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 pull does the merge as well, which is remote -> local > working copy? Terminology is rather important here. I've also see the term staging area, which I assume is the lo

Re: GIT DIFF

2012-02-29 Thread Barrie Treloar
On Thu, Mar 1, 2012 at 1:28 PM, Chris Graham wrote: > One git specific question though, does a git pull, pull the changes all the > way down to your working copy? Again, sorry for the git ignorance. http://stackoverflow.com/questions/292357/whats-the-difference-between-git-pull-and-git-fetch Quo

Re: Modifying the site lifecycle

2012-02-29 Thread Benson Margulies
On Wed, Feb 29, 2012 at 9:46 PM, Chris Graham wrote: > I'm confused. > > HTML is a text file, so what does it's EOL style matter? What can I tell you? I got bit in the ankle by a CRLF at an early age and I try to stomp on them whenever I can ever since. > > But you address your other question,

Re: GIT DIFF

2012-02-29 Thread Chris Graham
I've done the diff implementation, but I wanted to check, as the last one that I've got to do, is update, and it's giving me some grief. Mostly in assignined the concept of Working Copy to what? In jazz, we basically have (from what I understand, similar to git) two or three levels of repositories

Re: Modifying the site lifecycle

2012-02-29 Thread Chris Graham
I'm confused. HTML is a text file, so what does it's EOL style matter? But you address your other question, the only way that I know is to do a propset of svn:eol-style. And I am not aware that the SCM API has the facility to do this. I'm pretty sure (as that's where I've been poking around lat

Re: GIT DIFF

2012-02-29 Thread Brett Porter
The answer to that is going to depend on the parameters you gave it and the state of the index. Maybe it might be better to look at it from the other angle - which scm:diff behaviour and parameters are you having trouble mapping onto the Jazz SCM provider? - Brett On 01/03/2012, at 11:41 AM,

Re: Modifying the site lifecycle

2012-02-29 Thread Benson Margulies
On the subject of newlines: personally, I think that Windows newlines in HTML files are evil. However, if that is an exotic belief on my part, I don't mind changing the code to normalize to native. It would be good to know what the svn eol-style is, but I don't see how do do that through scm.

Re: Modifying the site lifecycle

2012-02-29 Thread Benson Margulies
I forgot to check in my last set of changes, including most of usage.apt.vm. I just checked it in. I didn't name that class 'Abstract' because, well, I couldn't think of any 'abstract' methods to include in it :-) On Wed, Feb 29, 2012 at 5:49 PM, Hervé BOUTEMY wrote: > sorry, I can't find which

Re: GIT DIFF

2012-02-29 Thread Chris Graham
No it's not. I'm working on the jazz SCM provider. The GIT one, I'm using for reference, as it has similar concepts (re push/pull) to Jazz's (deliver/accept). So, yes, it's a GIT specific question, but it is very much the in the context of the maven-scm-providers. So, this is the right place to

Re: GIT DIFF

2012-02-29 Thread Ansgar Konermann
Am 01.03.2012 01:41 schrieb "Chris Graham" : > > Can someone please walk me through exactly what it is doing? This is the wrong list for git-related questions. Best Ansgar > > It's doing two different diffs, and then I'm not sure what, and I certainly > don't know why. > > TIA, > > -Chris

GIT DIFF

2012-02-29 Thread Chris Graham
Can someone please walk me through exactly what it is doing? It's doing two different diffs, and then I'm not sure what, and I certainly don't know why. TIA, -Chris

Re: Modifying the site lifecycle

2012-02-29 Thread Benson Margulies
I am a little lost - and sitting in a car. the doc I refer to is the apt doc in svn. did you add comments to the source there? I will up & read when I get home. On Feb 29, 2012, at 5:49 PM, "Hervé BOUTEMY" wrote: > sorry, I can't find which doc you're referring to: can you point me to it, > ple

Re: Intent to release Doxia and Site Plugin

2012-02-29 Thread Hervé BOUTEMY
done in r1295325 Le lundi 27 février 2012 22:20:19 Hervé BOUTEMY a écrit : > anybody interested in adding Markdown to modules map [1]? > > Regards, > > Hervé > > [1] http://maven.apache.org/doxia/doxia/index.html > > Le dimanche 26 février 2012 00:47:19 Dennis Lundberg a écrit : > > Hi > > >

Re: Modifying the site lifecycle

2012-02-29 Thread Hervé BOUTEMY
sorry, I can't find which doc you're referring to: can you point me to it, please? did you see the comments I added to actual sources? Are they accurate, or did I miss something? Regards, Hervé Le mercredi 29 février 2012 17:43:03 Benson Margulies a écrit : > On Wed, Feb 29, 2012 at 5:03 PM,

Re: Modifying the site lifecycle

2012-02-29 Thread Benson Margulies
On Wed, Feb 29, 2012 at 5:03 PM, Hervé BOUTEMY wrote: > wouldn't be following lifecycle more appropriate? >    svnpubsub:prepare: do an svn checkout >    site:stage -DstagingDirectory = svn checkout dir >    svnpusub:publish: do the svn checkins I think that this is essentially one of the two opt

Re: Modifying the site lifecycle

2012-02-29 Thread Hervé BOUTEMY
wouldn't be following lifecycle more appropriate? svnpubsub:prepare: do an svn checkout site:stage -DstagingDirectory = svn checkout dir svnpusub:publish: do the svn checkins then using "mvn site svnpubsub" would do the job and the site build would be standard, whatever steps are invol

Re: Intent to release Doxia and Site Plugin

2012-02-29 Thread Olivier Lamy
sorry for late response. The fun is I cannot reproduce that locally :-) I will revert your commit temporary to have logs from jenkins. Because I don't understand why this suddenly fail ! 2012/2/27 Dennis Lundberg : > On 2012-02-26 21:56, Robert Scholte wrote: >> Yes, great idea. >> >> Although, l