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: 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: 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: 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: 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: 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: 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