Stefan Reichör <[EMAIL PROTECTED]> writes: >> bzr did seem to report that I had deleted dvc-diff.el, so I had to add >> it back. > > Ah, that explains the behaviour that I see.
Yes. bzr uses file identifiers to manage renames. That is, when you do "bzr add", you create a unique file ID, and then, the file ID is the important thing about the file. Its name is just an info like any other. It works remarkably well when the file stays within the VCS. Merges through renames can be done without having to walk through history, ever. Just the two revisions to merge and the common ancestor are needed. It supports cross-renames (A => B; B => A), ... BUT, whenever the file goes out of the VCS and comes back, it's a disaster. "bzr remove foo; bzr add foo" creates a new file with the same name as the old. It totally breaks merging, history (try "bzr log lisp/dvc-diff.el" in your branch), ... You should revert to before the mistake, and reapply the patch (as patches, not as bzr bundles). $ bzr diff -r (n-1)..n branch | patch -p0 or something like this. -- Matthieu _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
