THIS, OTHER, BASE and moved files popping up (possibly bzr-svn)
John Arbash Meinel
john at arbash-meinel.com
Tue Sep 2 23:51:10 BST 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Andrew Bennetts wrote:
> John Arbash Meinel wrote:
> [...]
>> Klaas van Schelven wrote:
> [...]
>>> Today I was working alone, partially off line - so I have no concurrent
>>> others to blame. As far as I remember I did the following.
>>>
>>> * work happily offline, check everything in
>>> * bzr ci -m "..." a couple of times when no internet was available
>>> * bzr up
> [...]
>>> xxx.THIS
>>> xxx.THIS.moved
>>>
>>> * How did this happen? What is it I do not understand? How should I have
>>> worked off line?
>> I can certainly see how you could get .BASE/.OTHER files, but I don't see how
>> you would have gotten them 2x (which is what triggers the .moved to occur).
>
> You can get .moved files from update due to
> <https://bugs.launchpad.net/bzr/+bug/113809>. It's annoying, and confusing.
>
> -Andrew.
>
>
I know about that, but I don't see how it would be possible here. That happens
when you are using a heavyweight checkout and your working tree is out of date
with your local branch *and* your local branch is out of date with the
upstream branch.
- From what he described, this doesn't really seem possible (unless he used bzr
co --lightweight at some point to commit to the same local branch.)
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD4DBQFIvcNeJdeBCYSNAAMRAnOSAJjBRT6/72rbPJqSDyo7Gyb2MHUlAKCY+VZ7
aXgmZHAsRuzL1Nt3yNp+LQ==
=iYRl
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list