vc-update fails
Bug #148877 reported by
Soh Kam Yung
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
vc-bzr |
Won't Fix
|
Undecided
|
Riccardo Murri |
Bug Description
Emacs is displaying file <xxx> which is under the bzr version control. I make some changes to file.
I then commit the change to <xxx> using the command-line (bzr commit -m "..." <xxx>).
I attempted to update the emacs buffer for <xxx> using 'vc-update', but it fails with the following message:
"vc-update: Sorry, merging news is not implemented for Bzr"
Changed in vc-bzr: | |
assignee: | nobody → rmurri |
status: | New → Confirmed |
To post a comment you must log in.
On second thought: true, `vc-bzr` lacks vc-merge-news support, but
that is not what you want here.
vc-merge-news is used when the (on-disk) working copy of the file
needs to be updated from a newer copy in the repository, and the Emacs
buffer is updated as a consequence. This happens with centralized
VCSes like CVS or SVN, where many working copies read and write
changes to the same central repository: the remote repository copy can
differ from the local working copy because someone else committed
changes that you will need to merge into your local working copy.
This *does not* happen with Bzr, as each working tree has an
associated repository (branch), and the working copy is updated each
time the branch is updated. Bzr does not update the working tree only
in case of a `push` to a remote branch, so I think the only use case
for merge-news in Bzr would be the following:
1. Commit some changes to a local branch
2. `bzr push` the changes to a remote branch via SSH/SFTP
3. Use Emacs+Tramp to open a file in the remote branch' working tree
4. Use `vc-update` to update the remote working tree file (and Emacs
buffer) contents to match the latest branch changes.
Are there any other use cases for vc-update with Bzr?
If you just want to update the buffer contents from the file contents,
use `M-x revert-buffer` (Warning: this will discard any unsaved changes
in the buffer!)