Comment 5 for bug 77744

Revision history for this message
displayname (displayname) wrote :

Sorry to post this twice, but I think it really belongs here. This is another facet of the same problem:

c:\temp\BzrBug>mkdir Branch1
c:\temp\BzrBug>mkdir Branch2
c:\temp\BzrBug>cd Branch1
c:\temp\BzrBug\Branch1>bzr init
c:\temp\BzrBug\Branch1>mkdir TEST
c:\temp\BzrBug\Branch1>cd TEST
c:\temp\BzrBug\Branch1\TEST>echo foo > foo
c:\temp\BzrBug\Branch1\TEST>bzr add foo
added TEST
added TEST/foo

c:\temp\BzrBug\Branch1\TEST>echo bar > bar
c:\temp\BzrBug\Branch1\TEST>cd..
c:\temp\BzrBug\Branch1>bzr add test\bar
added test
added test/bar

c:\temp\BzrBug\Branch1>bzr status
added:
  TEST/
  TEST/foo
unknown:
  TEST/bar

#### Above is the first sign that something is wrong.

c:\temp\BzrBug\Branch1>bzr commit
Committing to: C:/temp/BzrBug/Branch1/
added TEST
added test
added TEST/foo
added test/bar
Committed revision 1.

#### Notice that both TEST/foo and test/bar are added. However the real problem happens when you try to pull:

c:\temp\BzrBug\Branch1>cd..
c:\temp\BzrBug>cd Branch2

c:\temp\BzrBug\Branch2>bzr init
c:\temp\BzrBug\Branch2>bzr pull ..\Branch1
+N TEST/
+N TEST/foo
+N test.moved/
+N test.moved/bar
Conflict adding file TEST. Moved existing file to test.moved.
1 conflicts encountered.
Now on revision 1.

#### Changes from Branch1 cannot be properly pulled to Branch2 because bzr renames the directory during the pull.

This is a problem for me right now since I added many files with the wrong case a few days ago and now cannot pull my changes from my desktop to my laptop. A fix (or even just a workaround) would be greatly appreciated.

Thanks!