Robert Collins wrote:
| Public bug report changed:
| https://launchpad.net/malone/bugs/33335
|
| Comment:
| On Thu, 2006-03-02 at 03:36 +0000, Aaron Bentley wrote:
|
|
|>Bzr branch should be doing a build-tree, not a merge or revert, so
|>1. It should not produce conflicts
|>2. It should throw an exception if there are
|
|
| It seems desirable that 'branch' preserve outstanding changes in a
| working tree - at least one user has been confused that it was not a
| full copy of the tree state.
Perhaps clone should do that, but when I want that behavior, I use cp
- -r. I only use branch when I want a fresh copy. And you can't satisfy
both "branch -r" and "clone semantics" in one command. I most certainly
do not want unversioned files or the modifications of files when I
branch-- usually I branch because I've got modifications, but I want to
work on something else in parallel.
Anyhow, this is a behavioral change, so I think it's appropriate to get
consensus first before making it.
If you're including unversioned files, well none of the tree primitives
include that, so you shouldn't use any. Just do the python equivalent
of cp-r. If you're just doing source files, build-tree will do the trick.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Robert Collins wrote: /launchpad. net/malone/ bugs/33335
| Public bug report changed:
| https:/
|
| Comment:
| On Thu, 2006-03-02 at 03:36 +0000, Aaron Bentley wrote:
|
|
|>Bzr branch should be doing a build-tree, not a merge or revert, so
|>1. It should not produce conflicts
|>2. It should throw an exception if there are
|
|
| It seems desirable that 'branch' preserve outstanding changes in a
| working tree - at least one user has been confused that it was not a
| full copy of the tree state.
Perhaps clone should do that, but when I want that behavior, I use cp
- -r. I only use branch when I want a fresh copy. And you can't satisfy
both "branch -r" and "clone semantics" in one command. I most certainly
do not want unversioned files or the modifications of files when I
branch-- usually I branch because I've got modifications, but I want to
work on something else in parallel.
Anyhow, this is a behavioral change, so I think it's appropriate to get
consensus first before making it.
If you're including unversioned files, well none of the tree primitives
include that, so you shouldn't use any. Just do the python equivalent
of cp-r. If you're just doing source files, build-tree will do the trick.
Aaron enigmail. mozdev. org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://
iD8DBQFEBnGt0F+ nu1YWqI0RAqu9AJ 9ae9qNi3IZAznBt 2Sw9zJOrm2Q1QCe PcaT aIBfYw50=
GLWnbseAUrXXCkG
=9sxD
-----END PGP SIGNATURE-----