Broken checkout when adding a file through a symbolic link
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Low
|
Unassigned |
Bug Description
I'm attaching a script to reproduce this issue. The short form is that I had a developer add the file to his working tree via a symbolic link in the branch. He realized he added it to the wrong place, went to revert it, and the command choked.
Here's a backtrace from 2.2b1:
Mon 2010-07-12 13:19:20 -0400
0.202 bazaar version: 2.2.0dev1
0.203 bzr arguments: [u'revert']
0.249 looking for plugins in /Users/
0.676 looking for plugins in /Users/
0.720 looking for plugins in /Library/
0.723 encoding stdout as sys.stdout encoding 'UTF-8'
0.845 opening working tree '/Users/
[67067] 2010-07-12 13:19:21.329 INFO: -D b/a@
0.920 Traceback (most recent call last):
File "/Users/
return the_callable(*args, **kwargs)
File "/Users/
ret = run(*run_argv)
File "/Users/
return self.run(
File "/Users/
return self._operation
File "/Users/
self.cleanups, self.func, *args, **kwargs)
File "/Users/
result = func(*args, **kwargs)
File "/Users/
self.
File "/Users/
report_
File "/Users/
return unbound(self, *args, **kwargs)
File "/Users/
report_changes)
File "/Users/
tt.apply()
File "/Users/
self.
File "/Users/
return unbound(self, *args, **kwargs)
File "/Users/
state.
File "/Users/
reverse=True):
File "/Users/
for item in delta:
File "/Users/
for item in delta:
File "/Users/
for item in delta:
File "/Users/
"entry with file_id None %r" % entry)
InconsistentDelta: An inconsistent delta was supplied involving u'a/bar.txt', None
reason: entry with file_id None None
0.921 Transferred: 0kB (0.0kB/s r:0kB w:0kB)
0.921 return code 3
Martin is currently working on the general symlink handling, and making it clear that doing "bzr add link/foo" is really meaning "bzr add target/ of/link/ foo". Which should fix these sorts of things.
I'm pretty sure this is a dupe of one of the ones he's working on, but I'm not positive which. For now I'm just picking one of them.