Comment 6 for bug 77744

Revision history for this message
Gordon Tyler (doxxx) wrote :

Comment #5 appears to be fixed in Bazaar 2.0.0:

<<<
C:\Temp\bzr>bzr init .
Created a standalone tree (format: 2a)

C:\Temp\bzr>mkdir TEST

C:\Temp\bzr>cd TEST

C:\Temp\bzr\TEST>echo foo > foo

C:\Temp\bzr\TEST>bzr add foo
adding TEST
adding TEST/foo

C:\Temp\bzr\TEST>echo bar > bar

C:\Temp\bzr\TEST>cd ..

C:\Temp\bzr>bzr add test\bar
adding TEST/bar

C:\Temp\bzr>bzr st
added:
  TEST/
  TEST/bar
  TEST/foo
>>>

Although the original bug still seems to exist in a slightly different form:

<<<
C:\Temp\bzr>bzr init .
Created a standalone tree (format: 2a)

C:\Temp\bzr>echo foo > foo

C:\Temp\bzr>bzr add
adding foo

C:\Temp\bzr>bzr commit -m 1
Committing to: C:/Temp/bzr/
added foo
Committed revision 1.

C:\Temp\bzr>ren foo FOO

C:\Temp\bzr>bzr st
removed:
  foo
unknown:
  FOO

C:\Temp\bzr>bzr add FOO

C:\Temp\bzr>bzr st
removed:
  foo
unknown:
  FOO
>>>

Attempting to remove 'foo' and add 'FOO' results in the following:

<<<
C:\Temp\bzr>bzr remove foo
bzr: ERROR: Can't safely remove modified or unknown files:
unknown:
  FOO
Use --keep to not delete them, or --force to delete them regardless.

C:\Temp\bzr>bzr remove foo --force
deleted FOO

C:\Temp\bzr>bzr add FOO
bzr: ERROR: No such file: u'C:/Temp/bzr/FOO'
>>>

However, after reverting to revision 1, the following works:

<<<
C:\Temp\bzr>bzr revert
 N foo

C:\Temp\bzr>ren foo FOO

C:\Temp\bzr>bzr st
removed:
  foo
unknown:
  FOO

C:\Temp\bzr>bzr mv foo FOO
foo => FOO

C:\Temp\bzr>bzr st
renamed:
  foo => FOO

C:\Temp\bzr>
>>>