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. Working from the group up: 1. We have, on our local machine, the sandbox. This is where things reside as files and directories on our disk. 2. We have, on the jazz server, a (the full name), Remote Repository Workspace (or more commonly Workspace). This is a logical construct on the server. 3. Optionally, we have, on the jazz server a (official name:) a flow target of the Repository Workspace. This is usually a Stream (closest thing is a branch), but can also be another Repository Workspace. We can have multiple Flow Targets. We checkin/load to/from the sandbox and the repository workspace. We deliver to our flow targets, or accept from our flow targets. This is controlled by the pushChanges flag, and is, from what I understand the same as the git push/pull. To, in Jazz it's a two stage process. I have to accept changes from the stream, and I then have to load them into the sandbox (I don't appear to have the conveienance of an update). For the diff command, what I am I doing the diff between? The sandbox and the repository (ie files that I have not checked in), or the repository and the stream (if a valid flow target exists) (ie, changes made by others). That is where the original question of what the gif diff came from, as I don't know what the currently implementation is actually doing, so that I can work out how to best map it to jazz SCM behaviour. 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. -Chris On Thu, Mar 1, 2012 at 12:31 PM, Brett Porter <[email protected]> wrote: > 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, Chris Graham wrote: > > > 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 > > -- > Brett Porter > [email protected] > http://brettporter.wordpress.com/ > http://au.linkedin.com/in/brettporter > http://twitter.com/brettporter > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > >
