equal
deleted
inserted
replaced
53 in_merge: bool, |
53 in_merge: bool, |
54 ) -> Result<(), DirstateError> { |
54 ) -> Result<(), DirstateError> { |
55 self.get_mut().remove_file(filename, in_merge) |
55 self.get_mut().remove_file(filename, in_merge) |
56 } |
56 } |
57 |
57 |
58 fn drop_file(&mut self, filename: &HgPath) -> Result<(), DirstateError> { |
58 fn drop_entry_and_copy_source( |
59 self.get_mut().drop_file(filename) |
59 &mut self, |
|
60 filename: &HgPath, |
|
61 ) -> Result<(), DirstateError> { |
|
62 self.get_mut().drop_entry_and_copy_source(filename) |
60 } |
63 } |
61 |
64 |
62 fn clear_ambiguous_times( |
65 fn clear_ambiguous_times( |
63 &mut self, |
66 &mut self, |
64 filenames: Vec<HgPathBuf>, |
67 filenames: Vec<HgPathBuf>, |