push fails rename missed file in target working tree
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
Undecided
|
Aaron Bentley |
Bug Description
Both branches should be on local disk, for push try to update working tree.
To reproduce bug you need to delete manually some file in target branch,
and in source branch rename this file to another name. Commit changes in source branch.
Don't commit in target branch.
Then try to push from source to target. Push fails with error:
NoSuchFile: No such file: XXX
When run status command in target branch after this push, bzr suggest to run update command.
Running update -- and you get the same error. Below is actual traceback:
bzr arguments: [u'update']
looking for plugins in D:\USER\
Plugin name __init__ already loaded
Plugin name __init__ already loaded
looking for plugins in C:/WINDOWS/
encoding stdout as sys.stdout encoding 'cp866'
opening working tree 'D:/USER/
got branch format Bazaar-NG Metadir branch format 5
Traceback (most recent call last):
File "D:\USER\
return run_bzr(argv)
File "D:\USER\
ret = run(*run_argv)
File "D:\USER\
return self.run(
File "D:\USER\
conflicts = tree.update()
File "D:\USER\
return self._update_
File "D:\USER\
return unbound(self, *args, **kwargs)
File "D:\USER\
this_tree=self)
File "D:\USER\
return merger.do_merge()
File "D:\USER\
merge = self.merge_
File "D:\USER\
file_status = self.merge_
File "D:\USER\
return contents_conflict()
File "D:\USER\
self.
File "D:\USER\
self.
File "D:\USER\
return file_kind(
File "D:\USER\
raise errors.
NoSuchFile: No such file: u'D:/USER/
return code 3
Comments from Aaron:
Okay, I think I see the cause of the bug: contents_conflict is
incorrectly assuming that it should delete the file if it has a file-id,
whether or not the file exists on disk.
I don't expect this will be hard to fix.
Changed in bzr: | |
assignee: | nobody → aaron-bentley |
status: | Confirmed → Fix Released |
Confirmed by Aaron in mailing list.