I thought that 'merge' looks at conflicts and warns you if there are some and 'load' just load without warnings, no?

Don't know about update nicolas On Tue, Oct 12, 2010 at 4:11 PM, Simon Denier <Simon.Denier(a)inria.fr&gt; wrote: On 12 oct. 2010, at 15:26, Guillermo Schwarz wrote: > HI again Simon, > > I looked at Gofer and certainly it looks like hg command line. Thanks! > > There is commit, update and push, but no pull? The docs in the page are a little bit like "Microsoft help" ;-) I think that fetch = pull. Lukas could answer precisely. I am not sure about the difference between load and update and merge. > > load Load the specified packages. > update Update the specified packages. > merge Merge the specified packages into their working copies. > localChanges Answer the changes between the base version and the working copy. > browseLocalChanges Browse the changes between the base version and the working copy. > remoteChanges Answer the changes between the working copy and the remote changes. > browseRemoteChanges Browse the changes between the working copy and the remote changes. > cleanup Cleans the specified packages. > commit Commit the modified specified packages. > commit: Commit the modified specified packages with the given commit message. > revert Revert the specified packages to the currently loaded version. > recompile Recompile the specified packages. > reinitialize Call the class side initializers on the specified packages. > unload Unload the specified packages. > fetch Download versions from remote repositories into the local cache. > push Upload local versions from local cache into remote repositories. > > I will take a closer look later. > > Cheers, > Guillermo. > > On Mon, Oct 11, 2010 at 9:32 AM, Simon Denier <Simon.Denier(a)inria.fr&gt; wrote: > Hi Guillermo > > I saw your commit and especially your comment > > "saving locally first, then remotelly, doesn't simply copy the changes like Mercurial does..." > > The way it works with Monticello, compared to Git/Mercurial (remember that Monticello was conceived before/in parallel with such systems...) > - the save command in MC always creates a new version of your package in the repository you selected > - saving a version on a remote repository also saves a local copy > - if you want to save a version first locally, then want to copy it later to another repository, use the "copy" command from the MC browser > > Alternatively, the Gofer API provides commands which are closes to Git/Mercurial workflows: push/fetch etc. > See http://www.lukas-renggli.ch/blog/gofer > > > BTW, is the fix complete? Your package only provides a new method FamixReference>>identityInstanceVariables > > -- > Simon > > > > > _______________________________________________ > Moose-dev mailing list > Moose-dev(a)iam.unibe.ch > https://www.iam.unibe.ch/mailman/listinfo/moose-dev > > > > -- > Saludos cordiales, > > Guillermo Schwarz > Sun Certified Enterprise Architect > _______________________________________________ > Moose-dev mailing list > Moose-dev(a)iam.unibe.ch > https://www.iam.unibe.ch/mailman/listinfo/moose-dev -- Simon _______________________________________________ Moose-dev mailing list Moose-dev(a)iam.unibe.ch https://www.iam.unibe.ch/mailman/listinfo/moose-dev -- Nicolas Anquetil Univ. Lille1 / INRIA-equipe RMod _______________________________________________ Moose-dev mailing list Moose-dev(a)iam.unibe.ch https://www.iam.unibe.ch/mailman/listinfo/moose-dev