Rev 2500: (Matthew Fuller) Updates to the tutorial in http://bzr.arbash-meinel.com/branches/bzr/jam-integration
John Arbash Meinel
john at arbash-meinel.com
Fri Jun 1 20:35:41 BST 2007
At http://bzr.arbash-meinel.com/branches/bzr/jam-integration
------------------------------------------------------------
revno: 2500
revision-id: john at arbash-meinel.com-20070601193523-n91zctoxflcm88h9
parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
parent: fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-06-01 14:35:23 -0500
message:
(Matthew Fuller) Updates to the tutorial
modified:
doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
------------------------------------------------------------
revno: 2495.4.9
revision-id: fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
parent: fullermd at over-yonder.net-20070530035512-5wygby6ekqi9uxc2
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-05-30 09:52:53 -0500
message:
Don't point people at the nonexistent 'status --all'.
------------------------------------------------------------
revno: 2495.4.8
revision-id: fullermd at over-yonder.net-20070530035512-5wygby6ekqi9uxc2
parent: fullermd at over-yonder.net-20070530035408-mpzp6fj1cp3k4c70
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:55:12 -0500
message:
Bump document version from 0.8 to 0.16.
------------------------------------------------------------
revno: 2495.4.7
revision-id: fullermd at over-yonder.net-20070530035408-mpzp6fj1cp3k4c70
parent: fullermd at over-yonder.net-20070530034609-o0yzwdqtu8fpj468
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:54:08 -0500
message:
De-emphasize the heck out of manually rsync'ing for 'push', and
emphasize the builtin 'push'.
------------------------------------------------------------
revno: 2495.4.6
revision-id: fullermd at over-yonder.net-20070530034609-o0yzwdqtu8fpj468
parent: fullermd at over-yonder.net-20070530034330-iog9fm92mph4zyy9
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:46:09 -0500
message:
Reorganize some text to emphasize 'bzr branch' over grabbing a tarball
or rsync'ing.
------------------------------------------------------------
revno: 2495.4.5
revision-id: fullermd at over-yonder.net-20070530034330-iog9fm92mph4zyy9
parent: fullermd at over-yonder.net-20070530033244-r70yfpy0rbswxnt9
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:43:30 -0500
message:
Another place where we need to clarify that 'rm' may or may not delete
the file.
------------------------------------------------------------
revno: 2495.4.4
revision-id: fullermd at over-yonder.net-20070530033244-r70yfpy0rbswxnt9
parent: fullermd at over-yonder.net-20070530032834-bp98yu8tjheuvdpy
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:32:44 -0500
message:
Adjust diff output to look like diff output looks.
------------------------------------------------------------
revno: 2495.4.3
revision-id: fullermd at over-yonder.net-20070530032834-bp98yu8tjheuvdpy
parent: fullermd at over-yonder.net-20070530032249-tww05uv09iomg7sw
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:28:34 -0500
message:
X-ref "Publishing your branch" section from the discussion of branch
locations. A question was posed on IRC suggesting a need for this.
------------------------------------------------------------
revno: 2495.4.2
revision-id: fullermd at over-yonder.net-20070530032249-tww05uv09iomg7sw
parent: fullermd at over-yonder.net-20070530031550-fipr8tf74ni89fyg
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:22:49 -0500
message:
rm does sometimes remove the file now. Try and make that a little
more correct, without being hopelessly complicated.
------------------------------------------------------------
revno: 2495.4.1
revision-id: fullermd at over-yonder.net-20070530031550-fipr8tf74ni89fyg
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:15:50 -0500
message:
Get rid of references to 'bzr unknowns'.
-------------- next part --------------
=== modified file 'doc/tutorial.txt'
--- a/doc/tutorial.txt 2007-04-03 22:58:12 +0000
+++ b/doc/tutorial.txt 2007-05-30 14:52:53 +0000
@@ -11,7 +11,7 @@
Bazaar Tutorial
===============
-Current for bzr-0.8, 2006-04
+Current for bzr-0.16, 2007-05
Introduction
@@ -180,15 +180,21 @@
% bzr status
unknown:
hello.txt
- % bzr unknowns
- hello.txt
% bzr add hello.txt
added hello.txt
- % bzr unknowns
+ % bzr status
+ added:
+ hello.txt
If you add the wrong file, simply use **bzr remove** to make it
-unversioned again. This does not delete the working copy.
+unversioned again. This does not delete the working copy in this case,
+though it may in others [2]_.
+
+.. [2] ``bzr remove`` will remove the working copy if it is currently
+ versioned, but has no changes from the last committed version. You
+ can force the file to always be kept with the ``--keep`` option to
+ ``bzr remove``, or force it to always be deleted with ``--force``.
Branch locations
================
@@ -210,6 +216,9 @@
By installing bzr plugins you can also access branches using the rsync
protocol.
+See the `Publishing your branch`_ section for more about how to put your
+branch at a given location.
+
Reviewing changes
=================
@@ -234,9 +243,9 @@
modified:
foo
-By default **bzr status** hides "boring" files that are either unchanged
-or ignored. To see them too, use the --all option. The status command
-can optionally be given the name of some files or directories to check.
+**bzr status** hides "boring" files that are either unchanged or ignored.
+The status command can optionally be given the name of some files or
+directories to check.
bzr diff
--------
@@ -246,10 +255,10 @@
''patch'', ''diffstat'', ''filterdiff'' and ''colordiff''::
% bzr diff
- *** added file 'hello.txt'
- --- /dev/null
- +++ hello.txt
- @@ -1,0 +1,1 @@
+ === added file 'hello.txt'
+ --- hello.txt 1970-01-01 00:00:00 +0000
+ +++ hello.txt 2005-10-18 14:23:29 +0000
+ @@ -0,0 +1,1 @@
+hello world
@@ -432,9 +441,9 @@
directory. This is a bit different to CVS, which requires that you also
do **cvs remove**.
- **bzr remove** makes the file un-versioned, but does not delete
- the working copy. This is useful when you add the wrong file, or decide
- that a file should actually not be versioned.
+ **bzr remove** makes the file un-versioned, but may or may not delete
+ the working copy [2]_. This is useful when you add the wrong file,
+ or decide that a file should actually not be versioned.
::
@@ -457,10 +466,9 @@
=========
Often rather than starting your own project, you will want to submit a
-change to an existing project. You can get a copy of an existing branch
-by copying its directory, expanding a tarball, or by a remote copy using
-something like rsync. You can also use bzr to fetch a copy. Because this
-new copy is potentially a new branch, the command is called *branch*::
+change to an existing project. To do this, you'll need to get a copy of
+the existing branch. Because this new copy is potentially a new branch,
+the command is called **branch**::
% bzr branch http://bazaar-vcs.org/bzr/bzr.dev
% cd bzr.dev
@@ -469,6 +477,9 @@
operations on it locally: log, annotate, making and merging branches.
There will be an option to get only part of the history if you wish.
+You can also get a copy of an existing branch by copying its directory,
+expanding a tarball, or by a remote copy using something like rsync.
+
Following upstream changes
==========================
@@ -528,17 +539,23 @@
directory. One can push a branch (or the changes for a branch) by one of
the following three methods:
-* Rsync: rsync -avrz LOCALBRANCH servername.com/path/to/directory
-
- (or any other tool for publishing a directory to a web site.)
-
-* bzr push sftp://servername.com/path/to/directory
+* The best method is to use bzr itself to do it.
+
+ ::
+
+ % bzr push sftp://servername.com/path/to/directory
(The destination directory must already exist unless the
``--create-prefix`` option is used.)
-* The rspush plugin that comes with BzrTools
+* Another option is the rspush plugin that comes with BzrTools, which
+ uses rsync to push the changes to the revision history and the working
+ tree.
+You can also use copy the files around manually, by sending a tarball, or
+using rsync, or other related file transfer methods. This is usually
+less safe than using ``push``, but may be faster or easier in some
+situations.
Moving changes between trees
============================
More information about the bazaar-commits
mailing list