Re re: About merging

[Aaron Bentley]

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

Erik Bågfors wrote:
> I assume that in this example... 1 and 2 are two different branches
> and that they have no common history.  You simply did "bzr init" in
> both directories, added the files and commited.
> 
> That means that bzr has no way of knowing that file1.php in 1 and
> file1.php in 2 is the same file.  After all, the filename is in no way
> an indication that the files are the same.

That all sounds right.  I should add that this situation can and will be
handled better.

1. This situation should cause conflicts, not errors.
2. There should be a way to force bzr to recognize that 1/file1.php and
2/file1.php are the same file.  Probably ID aliases, or maybe just "bzr
merge --names".

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

iD8DBQFCsf9V0F+nu1YWqI0RAh2/AJ0QmHrgWGZ8ze171EetD5m5SQrHlwCfXZ8T
SKLNH1F2HPN1JxFACzblqvU=
=pnNS
-----END PGP SIGNATURE-----