diff options
| author | Ian Bicking <ianb@colorstudy.com> | 2010-04-22 03:07:57 -0500 |
|---|---|---|
| committer | Ian Bicking <ianb@colorstudy.com> | 2010-04-22 03:07:57 -0500 |
| commit | 1654cef71a71ddf57d6efec20bb13455f7b0c577 (patch) | |
| tree | 93eca0a98ecad3fb8297d4cdeb6fc4cd67c913c0 | |
| parent | 35f159aa4f57125bf9f43cb169eb5c87c4901c5d (diff) | |
| download | pip-1654cef71a71ddf57d6efec20bb13455f7b0c577.tar.gz | |
title changes
| -rw-r--r-- | docs/branches.txt | 5 | ||||
| -rw-r--r-- | docs/index.txt | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/docs/branches.txt b/docs/branches.txt index 6e167fd6c..1b866d0b8 100644 --- a/docs/branches.txt +++ b/docs/branches.txt @@ -1,3 +1,6 @@ +Branching (for developing pip) +============================== + Normally in Mercurial the main branch is called "default." In the pip repository, because of how it was imported from Subversion, the main branch has historically been "trunk" instead. This has occasionally caused @@ -23,7 +26,7 @@ $ hg pull http://bitbucket.org/somebody/pip $ hg up trunk # update to their latest commit, on "trunk" $ hg commit -m 'close trunk branch, again' $ hg up default # update back to mainline -$ hg merge trunk +$ hg merge trunk $ hg commit -m 'merged changes from somebody' (Yes, it seems like it ought to be possible to merge a branch and close it diff --git a/docs/index.txt b/docs/index.txt index 1911f04c3..124f72527 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -12,6 +12,7 @@ entry <http://pypi.python.org/pypi/pip>`_ (or the `repository news requirement-format configuration + license .. comment: split here @@ -84,7 +85,7 @@ Uninstall --------- pip is able to uninstall most installed packages with ``pip uninstall -package-name``. +package-name``. Known exceptions include pure-distutils packages installed with ``python setup.py install`` (such packages leave behind no metadata allowing @@ -106,10 +107,10 @@ When installing software, and Python packages in particular, it's common that you get a lot of libraries installed. You just did ``easy_install MyPackage`` and you get a dozen packages. Each of these packages has its own version. -Maybe you ran that installation and it works. Great! Will it keep working? +Maybe you ran that installation and it works. Great! Will it keep working? Did you have to provide special options to get it to find everything? Did you have to install a bunch of other optional pieces? Most of all, will you be able -to do it again? Requirements files give you a way to create an *environment*: +to do it again? Requirements files give you a way to create an *environment*: a *set* of packages that work together. If you've ever tried to setup an application on a new system, or with slightly @@ -189,7 +190,7 @@ Bundles Another way to distribute a set of libraries is a bundle format (specific to pip). This format is not stable at this time (there simply hasn't been any feedback, nor a great deal of thought). A bundle file contains all the -source for your package, and you can have pip install them all together. +source for your package, and you can have pip install them all together. Once you have the bundle file further network access won't be necessary. To build a bundle file, do:: |