RFC: local file modified if older than stored file?

[Aaron Bentley]

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

martin f krafft wrote:
| Take two related branches, checked out: if I commit to one and push
| the changes to the other one, I get behaviour that's (a) expected on
| a theoretical level, (b) highly unexpected on a practical level.

You're not testing with metadir branches, where the last-revision for a
tree is different from the last-revision of the branch.

abentley at lappy:~$ mkdir bzrtest
abentley at lappy:~$ cd bzrtest
abentley at lappy:~/bzrtest$ bzr init branch --format metadir
abentley at lappy:~/bzrtest$ cd branch
abentley at lappy:~/bzrtest/branch$ echo "hello" > a
abentley at lappy:~/bzrtest/branch$ bzr add
added a
abentley at lappy:~/bzrtest/branch$ bzr commit -m "blah"
added a
Committed revision 1.
abentley at lappy:~/bzrtest/branch$ cd ..
abentley at lappy:~/bzrtest$ bzr branch
sftp://localhost/home/abentley/bzrtest/branch branch2
Branched 1 revision(s).
abentley at lappy:~/bzrtest$ cd branch2
abentley at lappy:~/bzrtest/branch2$ echo bye > a
abentley at lappy:~/bzrtest/branch2$ bzr commit -m "bye"
modified/renamed/reparented a
Committed revision 2.
abentley at lappy:~/bzrtest/branch2$ bzr push
sftp://localhost/home/abentley/bzrtest/branch
bzr: WARNING: This transport does not update the working tree of:
sftp://localhost/home/abentley/bzrtest/branch/
1 revision(s) pushed.
abentley at lappy:~/bzrtest/branch2$ cd ../branch
abentley at lappy:~/bzrtest/branch$ bzr status
abentley at lappy:~/bzrtest/branch$ bzr update
All changes applied successfully.
Updated to revision 2.
abentley at lappy:~/bzrtest/branch$ bzr status
abentley at lappy:~/bzrtest/branch$

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

iD8DBQFEJWz40F+nu1YWqI0RAjQ2AJ9hgcn9ERugCRP+Xl4giHWK8RiJpwCdFL1p
43uWmKfGyYM7KJBUSRiAsaQ=
=hqqT
-----END PGP SIGNATURE-----