Bazaar error (case sensitivity conflict?)

Paul Moore p.f.moore at gmail.com
Thu Mar 27 17:58:23 GMT 2008


On 27/03/2008, Aaron Bentley <aaron at aaronbentley.com> wrote:
> I would try reverting, and if that didn't work, I would try making a
> lightweight checkout.

Well, I'm not sure (from what I have) what I'd revert. I'll clarify
below. A lightweight checkout wouldn't help, as the point of this is
to work out what process to use to have a local mirror I can use
offline.

When I say I don't know what to revert, the process I'm going through
is something along the lines of

bzr init
for i = 1000 to 30000 step 1000
    bzr pull -r $i http://remote/svn/repository (or local svnclone'd copy)
end

So I'm pulling a full remote repo in chunks of 1000 revisions. I'm
trying to do this because a bzr branch blows up needing too much
memory, so I'm trying an incremental approach.

The case collisions happen on files that are far back in history (the
project realised that case clashes caused problems and so removed
them), and I am extremely unlikely to care about them. But I don't
know what files are involved, what revision they appeared in and when
they were deleted. So I'm unable to do any focussed fixes.

> This bug is happening when modifying your local working tree.
> Historical data shouldn't matter for that.

Well, I'm pulling in stages so what's in the local tree is only a
temporary thing. That makes me think that --no-trees may help. I'll
give it a try.

> > Path conflict: <deleted> / Demo/sgi/video/vinfo.py.moved
> > Path conflict: <deleted> / Demo/sgi/video/vtime.py.moved
> > Path conflict: <deleted> / Demo/sgi/video/vcopy.py.moved
>
> This conflict here is that you've deleted these files in one place and
> renamed them in another place.  Bazaar can't tell that they were
> automatically renamed.

OK, I see that. Doesn't help me work round it, unfortunately, but I
see what you're saying :-)

Thanks for the help and clarifications.
Paul.



More information about the bazaar mailing list