THIS, OTHER, BASE and moved files popping up (possibly bzr-svn)
Andrew Bennetts
andrew at canonical.com
Tue Sep 2 23:42:06 BST 2008
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.
More information about the bazaar
mailing list