720 

   720 

   721     fn add_file(

   721     fn add_file(

   722         &mut self,

   722         &mut self,

   723         filename: &HgPath,

   723         filename: &HgPath,

   724         entry: DirstateEntry,

   724         entry: DirstateEntry,

   725         from_p2: bool,

   726         from_p2: bool,

   726         possibly_dirty: bool,

   727         possibly_dirty: bool,

   727     ) -> Result<(), DirstateError> {

   728     ) -> Result<(), DirstateError> {

   728         let mut entry = entry;

   729         let mut entry = entry;

   730             assert!(!possibly_dirty);

   731             assert!(!possibly_dirty);

   731             assert!(!from_p2);

   732             assert!(!from_p2);

   732             entry.size = SIZE_NON_NORMAL;

   734             entry.size = SIZE_NON_NORMAL;

   733             entry.mtime = MTIME_UNSET;

   735             entry.mtime = MTIME_UNSET;

   734         } else if from_p2 {

   736         } else if from_p2 {

   735             assert!(!possibly_dirty);

   737             assert!(!possibly_dirty);

   736             entry.size = SIZE_FROM_OTHER_PARENT;

   738             entry.size = SIZE_FROM_OTHER_PARENT;