Bazaar 1.0 alpha, and packs as default
John Arbash Meinel
john at arbash-meinel.com
Fri Nov 30 16:46:43 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Ian Clatworthy wrote:
> Martin Pool wrote:
>> I want to switch over to packs as the default format for bzr.dev
>> today, and make a 1.0 alpha-test release based on that tomorrow.
>
> I'm planning to submit the User Guide in the next few hours to PQM,
> given I think it ought to be in the RC and feedback received by others,
> both on and off-list, has all been positive.
>
> Some emails have been very helpful in pointing out Linux-centric file
> locations, something I'm planning to tweak before submitting it. The
> patch will also include svg's, not just the png's, for diagrams. I have
> other minor tweaks as well I'm making to improve readability, nothing
> new content wise though.
>
> I don't think anyone in the core has time right now for a full review so
> I'd like to point out some particular sections for someone in the core
> to check please:
>
> * section 3.8 - Undoing mistakes
> * section 5.5 - Reusing a checkout.
>
> I'm 99% confident about the technical accuracy of the rest of the new
> content.
>
> Ian C.
>
>
+ bzr add foo.html
+ (oops - didn't mean that)
+ bzr remove foo.html
+ (foo.html left on disk)
^- I think we actually error out, and ask the user to use either "bzr remove
- --keep" or "bzr remove --force".
...
+Undoing the last commit
+-----------------------
^- you mention it is nice if you mess up the commit message.
*I've* also used it a lot for when I realize I forgot to add a file. (But I now
use commit --strict to avoid that entirely.)
...
+Undoing an earlier commit
+-------------------------
^- I don't really like using "Undoing" here. Maybe "restoring to an earlier
commit" or "reverting to an earlier commit". (this would be for 'bzr revert -r X')
For what you actually describe here, it is more like "Undoing multiple
commits". Which is accurate.
You may also want to mention that "bzr uncommit" restores any merges.
Alternatively, "Undoing an earlier commit" would be better described with "bzr
merge -r 10..9 .". Since that applies the reverse changes of revision 10.
Would it be better to call the section "fixing mistakes" ? maybe not, as "undo"
tends to mean "pretend they never happened" which is what most of the advice
here is about. (uncommit versus revert)
On to "reusing a checkout"....
+Note that simply binding to a new branch
+and running ``update`` is not enough: you need the ``revert`` to
+throw away any local differences in the working tree.
^- You make this sound like it is a bad thing, rather than showing them why
they would want the extra step.
Note that simply binding to a new branch and running ``update`` merges in your
local changes. If you want these changes in the new location, you can
``commit`` them or ``revert`` them.
...
+In many ways, ``switch`` operates like ``update`` in that it
+refreshes your working tree and merges in any local changes you
+have made. The primary different is that ``switch`` requires
+a branch location and it is only supported (currently) on
+lightweight checkouts.
^- "bzr bind + bzr update" will use the ancestor to switch (I believe), and
then marks committed changes as merged.
"bzr switch" uses a tip=>tip merge. Which means that it only preserves
*uncommitted* changes.
There can be a fairly large difference between the two. I'm not sure how to
describe it succinctly. But it is probably worth pointing out that the "bind +
update" is more like "bzr switch NEW_BRANCH; bzr merge OLD_BRANCH".
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHUD5zJdeBCYSNAAMRAoKUAJ9kQTRi97Ms55zX1QgO8S1H1rpgkwCgiFNN
2B63p3ubLsAGwZtj0SjImF4=
=kAlu
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list