Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move FiPy to distributed version control #287

Closed
guyer opened this issue Sep 19, 2014 · 13 comments
Closed

move FiPy to distributed version control #287

guyer opened this issue Sep 19, 2014 · 13 comments

Comments

@guyer
Copy link
Member

guyer commented Sep 19, 2014

Distributed version control is the future (and has been for a couple of years already).

The scientific Python community seems to have settled on [http://git-scm.com/ git].

We should briefly evaluate the alternatives ([http://mercurial.selenic.com/ Hg], [http://bazaar.canonical.com/en/ bzr], ...) and then make the move.

Imported from trac ticket #383, created by guyer on 11-10-2011 at 10:27, last modified: 06-12-2013 at 14:14

@guyer
Copy link
Member Author

guyer commented Sep 19, 2014

Repository migrated to [http://git-scm.com/ git]. Public repository at git://code.matforge.org/nist/fipy.git.

Need to rewrite documentation/ADMINISTRATA.txt

Awaiting Trac upgrade to [http://trac.edgewall.org/browser/tags/trac-1.0/RELEASE version 1.0] by Matforge.

Trac comment by guyer on 10-04-2012 at 09:54

@wd15
Copy link
Contributor

wd15 commented Sep 19, 2014

Update the docs to reflect git usage:

  • update USAGE.txt
  • update ADMINISTRATA.txt
  • add ADMINISTRATA.txt to the web docs
  • remove SVN.txt
  • add GIT.txt
  • maybe just merge GIT.txt into ADMINISTRATA.txt and release that.

Trac comment by wd15 on 03-28-2013 at 11:07

@guyer
Copy link
Member Author

guyer commented Sep 19, 2014

Pull request:


The following changes since commit fe00adaf9e4bc545ec5894e384213b3230e9dc2b:

  Merge remote-tracking branch 'origin/ticket513-problem_with_cylindrical_grid' into develop (2013-03-26 11:13:50 -0400)

are available in the git repository at:


  ssh://git@code.matforge.org/nist/fipy.git ticket383-update_ADMINISTRATA_txt

for you to fetch changes up to 8a067b7356cd9f507ffa5f4a4144f0ddcc96affd:

  ENH: Revise developer git instructions (2013-03-28 14:40:54 -0400)

----------------------------------------------------------------
Jonathan Guyer (8):
ignore files generated during documentation build and distribution
ENH: Change version control from svn to git
ENH: Update links to refer to git documentation
ENH: Remove obsolete references to Subversion
Merge branch 'develop' into ticket383-update_ADMINISTRATA_txt
ENH: Change references from svn to git
ENH: Update version control documentation to reflect git repository
ENH: Revise developer git instructions

 .gitignore                     |   6 +-
 INSTALLATION.txt               |  14 +--
 README.txt                     |   1 -
 documentation/ADMINISTRATA.txt | 363 ++++++++++++++++++++++++----------------------------------------------------
 documentation/GIT.txt          |  92 ++++++++++++++++++++
 documentation/SVN.txt          |  87 ------------------
 documentation/conf.py          |   3 +-
 documentation/contents.txt     |   2 +-
 documentation/refs.bib         |   8 ++
 9 files changed, 227 insertions(+), 349 deletions(-)
 create mode 100644 documentation/GIT.txt
 delete mode 100644 documentation/SVN.txt

Trac comment by guyer on 03-28-2013 at 14:45

@wd15
Copy link
Contributor

wd15 commented Sep 19, 2014

Closing this. Forgot to add the "fixes" keyword so closing manually.

Trac comment by wd15 on 04-01-2013 at 15:43

@guyer
Copy link
Member Author

guyer commented Sep 19, 2014

fipy/documentation/ADMINISTRATA.txt has errors that prevent building and uploading the docs.

Trac comment by guyer on 04-02-2013 at 09:58

@guyer
Copy link
Member Author

guyer commented Sep 19, 2014

Pull-request:

The following changes since commit e5d2233d8c1cfb2e3da7be9f05cf7c41ee6b975a:

  Merge branch 'ticket383-update_ADMINISTRATA_txt' into develop (2013-04-01 15:38:39 -0400)

are available in the git repository at:


  ssh://git@code.matforge.org/nist/fipy.git ticket383-fix_Git_and_ADMINISTRATA_errors

for you to fetch changes up to 072d6c92cfda5403b940fabf73f5d4ed6b7859eb:

  REL: Fix instructions to build and upload documentation (2013-04-02 09:46:22 -0400)

----------------------------------------------------------------
Jonathan Guyer (2):
DOC: Fix a grammatical error introduced by switching from "svn" to "git"
REL: Fix instructions to build and upload documentation

 documentation/ADMINISTRATA.txt | 3 ++-
 documentation/GIT.txt          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

Trac comment by guyer on 04-02-2013 at 09:59

@wd15
Copy link
Contributor

wd15 commented Sep 19, 2014

Merged pull request with [873c55e/fipy].

Trac comment by wd15 on 04-02-2013 at 13:42

@fipymigrate
Copy link

In e46d727:

#CommitTicketReference repository="fipy" revision="e46d727e4ca5a2465bc09eebdd505f3e190c9614"
ENH: Change version control from svn to git

Addresses issue #287

Trac comment by Jonathan Guyer guyer@nist.gov on 06-12-2013 at 14:14

@fipymigrate
Copy link

In 4327ef6:

#CommitTicketReference repository="fipy" revision="4327ef6d79749d987223414cf4e443bd443473fa"
ENH: Update links to refer to git documentation

Addresses issue #287

Trac comment by Jonathan Guyer guyer@nist.gov on 06-12-2013 at 14:14

@fipymigrate
Copy link

In 676734b:

#CommitTicketReference repository="fipy" revision="676734bbba5c7b07b23d6f6a0a0413121d256d78"
ENH: Remove obsolete references to Subversion

Addresses issue #287

Trac comment by Jonathan Guyer guyer@nist.gov on 06-12-2013 at 14:14

@fipymigrate
Copy link

In a69cd3b:

#CommitTicketReference repository="fipy" revision="a69cd3b1f564a8ba38141caa9268c6db0da285a8"
ENH: Change references from svn to git

Addresses issue #287

Trac comment by Jonathan Guyer guyer@nist.gov on 06-12-2013 at 14:14

@fipymigrate
Copy link

In cd48df5:

#CommitTicketReference repository="fipy" revision="cd48df50871150b320262be6abf3662109369e6e"
ENH: Update version control documentation to reflect git repository

Addresses issue #287

Trac comment by Jonathan Guyer guyer@nist.gov on 06-12-2013 at 14:14

@fipymigrate
Copy link

In 8a067b7:

#CommitTicketReference repository="fipy" revision="8a067b7356cd9f507ffa5f4a4144f0ddcc96affd"
ENH: Revise developer git instructions

Addresses issue #287

Trac comment by Jonathan Guyer guyer@nist.gov on 06-12-2013 at 14:14

@guyer guyer closed this as completed Sep 19, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants