[PATCH] branch and pull

Aaron Bentley aaron.bentley at utoronto.ca
Sun May 29 04:35:40 BST 2005


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This patch adds 'branch' and 'pull' commands.  Currently, they work only
with local branches, but they should support remote branches once remote
branches are complete.

'branch' is much slower than cp -a, because it operates on at highter
level.  It's CPU-bound at the beginning and I imagine this due to XML
parsing.

'pull' updates the revision stores, then does a three-way merge on the
working directory, to ensure the working copy has the latest upstream
changes.  Local changes will be preserved, but may produce conflicts.

Branch and pull are history-based, and copy the bare minimum needed to
produce all the revisions in a tree's history.  So if you've been
removing revisions from your history, you can use branch to optimize
your storage.  Slightly.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCmTiM0F+nu1YWqI0RApCoAKCG9jgwcrCM72hhL9usoRhmWtd3bQCcD2S3
+M6EDXX4xbe6VC1EZJpwGvY=
=pQ0T
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pullbranch.patch
Type: text/x-patch
Size: 10334 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050528/25e209fc/attachment.bin 


More information about the bazaar mailing list