On 03/12/2013 03:48 PM, Barry Smith wrote: > > On Mar 12, 2013, at 3:42 PM, Matthew Knepley <knepley at gmail.com> wrote: > >> On Tue, Mar 12, 2013 at 4:30 PM, Barry Smith <bsmith at mcs.anl.gov> wrote: >> >> On Mar 12, 2013, at 2:52 PM, Karl Rupp <rupp at mcs.anl.gov> wrote: >> >>> Hi Richard, >>> >>> Jed and I set up detailed instructions on how to use Git and Mercurial: >>> https://bitbucket.org/petsc/petsc/wiki/Home >> >> Note that both Karl and Jed know git very well, so these pages will pretty >> much suck for new users. >> >> I agree. That is why its important that its a Wiki. > > Because you perceive a Wiki as something that is very easy to change > something in quickly. I think in that sense > Wikis are like PERL, it is very quick to put something together that looks > powerful, but long term maintenance and > general extension is impossible. Why not put all PETSc source code into the > wiki then we can easily edit it without > bothering with Emacs and shells? >
In most systems, wikis are backed by a database*, so in practice there's little difference (with the added benefit that a wiki gives you layout). * - not sure about this in the case of bitbucket, but I'd be surprised if it wasn't. Also, I find that infographics here help a bunch, like http://mercurial.selenic.com/wiki/QuickReferenceCardsAndCheatSheets?action=AttachFile&do=get&target=Mercurial-Usage-v1.0bz-300dpi-color.png. I looked a few days ago and couldn't find a good one for git. Especially with the conventions described for petsc (which all seem reasonable), I think such a graphic would really help, as it's easy to confuse next vs. master vs. branches and the movement between them. - tim > I am fine with putting that stuff there in the short term, but how about in > the longer term having it as a subtree > (subrepo?) in the petsc/src/docs/ directory? > > Barry > >> I checked one thing in this morning. >> >> Matt >> >> >> Barry >> >>> >>> In short, to get your changes merged back 'upstream', you still just need >>> to send a pull request for petsc-hg on >>> Bitbucket. :-) >>> >>> Best regards, Karli >>> >>> >>> >>> On 03/12/2013 02:42 PM, Richard Tran Mills wrote: >>>> Hi Barry, >>>> >>>> I will start using Git for working with petsc-dev when there are some >>>> clear instructions on the workflow we >>>> should be using. In the meantime I have some petsc-dev tasks on my to-do >>>> list and I plan to work using a fork >>>> of petsc-hg. To get my changes merged back "upstream", I assume I still >>>> just need to submit a pull request for >>>> petsc-hg on BitBucket? >>>> >>>> Thanks, Richard >>>> >>>> On 3/12/13 12:16 PM, Barry Smith wrote: >>>>> >>>>> PETSc dev users, >>>>> >>>>> The PETSc repositories have been moved. They are at >>>>> >>>>> https::/bitbucket.org/petsc/petsc <http://bitbucket.org/petsc/petsc> (git >>>>> version) >>>>> https:/bitbucket.org/petsc/petsc-hg <http://bitbucket.org/petsc/petsc-hg> >>>>> (Mecurial version) >>>>> >>>>> please reclone all your repositories and do not use the previous >>>>> repository! >>>>> >>>>> You may make pull requests via bitbucket for either repository. The >>>>> Mecurial version is read only; active >>>>> developers with write access will be working with the git version but the >>>>> the Mecurial version will always be >>>>> in sync with the master branch of the git version. >>>>> >>>>> Problems? Send email or bug one of Jed, Satish, Barry >>>>> >>>>> Barry >>>>> >>>>> >>>>> Begin forwarded message: >>>>> >>>>>> *From: *Jed Brown <jedbrown at mcs.anl.gov <mailto:jedbrown at >>>>>> mcs.anl.gov>> *Subject: **petsc-hg* *Date: *March >>>>>> 12, 2013 10:20:51 AM CDT *To: *Barry Smith <bsmith at mcs.anl.gov >>>>>> <mailto:bsmith at mcs.anl.gov>> >>>>>> >>>>>> https://bitbucket.org/petsc/petsc-hg/ >>>>>> >>>>>> This is currently writable only by me. It will mirror 'master' from the >>>>>> Git repo and people can send pull >>>>>> requests to it. >>>>> >>>> >>>> >>>> -- Richard Tran Mills, Ph.D. Computational Earth Scientist | Joint >>>> Assistant Professor Hydrogeochemical >>>> Dynamics Team | EECS and Earth & Planetary Sciences Oak Ridge National >>>> Laboratory | University of >>>> Tennessee, Knoxville E-mail:rmills at ornl.gov V: >>>> 865-241-3198http://climate.ornl.gov/~rmills >>>> >>> >> >> >> >> >> -- What most experimenters take for granted before they begin their >> experiments is infinitely more interesting than >> any results to which their experiments lead. -- Norbert Wiener > > -- ================================================================ "You will keep in perfect peace him whose mind is steadfast, because he trusts in you." Isaiah 26:3 Tim Tautges Argonne National Laboratory (tautges at mcs.anl.gov) (telecommuting from UW-Madison) phone (gvoice): (608) 354-1459 1500 Engineering Dr. fax: (608) 263-4499 Madison, WI 53706
