Comment 21 for bug 855155

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

On 9/28/2012 3:06 AM, Tom Browder wrote:
> On Thu, Sep 27, 2012 at 11:18 AM, John Arbash Meinel
> <email address hidden> wrote: ...
>> On 9/27/2012 6:25 PM, Tom Browder wrote:
>>> I, too, have gotten my working tree into the inconsistent state
>>> and need to get it functional again. Any solutions yet?
> ...
>> If it is just an issue with the WT, you can run 'bzr
>> reset-workingtree' and it should rebuild the right files. You'll
>> lose information about uncommitted revisions (like after a
>> merge), or about renames, etc. However it will leave changes in
>> the WT alone otherwise.
>
> Let me get this right, John. The files and directories them
> selves will NOT change, just the log and other such metadata?
>
> I can live with that, but, if the changes I've made are rolled
> back, I will pull out my hair!
>
> Best,
>
> -Tom
>

Correct. So if you did a 'bzr mv a b' then the directory will still be
called 'b', but bzr will now tell you that 'a is missing' and 'b is
unknown'. You can use bzr mv --after or maybe bzr mv --auto to tell
bzr about the existing renames.

(It doesn't change the content of the working tree, it just tells bzr
to reset its knowledge about the tree.)

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (Cygwin)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iEYEARECAAYFAlBlX/IACgkQJdeBCYSNAAODdACfRXmJ6QN4tZMe3PiOC8kOsL2M
lwgAoMBNQ+Im6ERc+OFRkTvDUC9KVYqv
=kE18
-----END PGP SIGNATURE-----