diff should warn if tree is out of date with branch
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Wishlist
|
Unassigned |
Bug Description
I have two identical branches on two machines. After making changes to the local machine and pushing the changes to the remote with "bzr push", the remote branch is updated but not the working tree as expected and displayed in the warning message.
However, when entering a "bzr diff" on the remote machine (before a "bzr update"), there is no output. I would expect to see the changes between the last revision and the working tree (or in other words, the reverse of the changes just pushed from the other branch). An other option would be a message that the working tree is out of date, as "bzr status" shows in this case.
After a "bzr update" the working tree is updated as expected and "bzr diff" shows no output as expected.
bzr version is 1.10.
summary: |
- "bzr diff" after "bzr push" does not display changes + diff should warn if tree is out of date with branch |
Changed in bzr: | |
importance: | Undecided → Wishlist |
Changed in bzr: | |
status: | New → Confirmed |
tags: | added: easy |
tags: | added: diff |
tags: | added: check-for-breezy |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Ioannis Ramfos wrote:
> However, when entering a "bzr diff" on the remote machine (before a "bzr
> update"), there is no output.
This is by design. The diff is always against the working tree, not the
branch.
Aaron enigmail. mozdev. org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkl 1Fd4ACgkQ0F+ nu1YWqI1nmgCdHA fJTpatDvFv81UHV 3e4jKII SEmT/1lvCdlZ7IB Xb
xVgAniDgRjLRiaA
=Z2+j
-----END PGP SIGNATURE-----