Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

shellext/dirstate: 'modified' wins over 'added' for directories

Changeset e0f05652b363…

Parent ad0ae5321a32…

by Adrian Buehlmann

Changes to one file · Browse files at e0f05652b363 Showing diff from parent ad0ae5321a32 Diff from another changeset...

Change 1 of 2 Show Entire File tortoise/​shellext/​dirstate.cpp Stacked
 
298
299
300
301
 
302
303
304
 
325
326
327
328
 
 
 
329
330
331
332
333
334
 
298
299
300
 
301
302
303
304
 
325
326
327
 
328
329
330
331
 
 
332
333
334
@@ -298,7 +298,7 @@
    rootlen = strlen(hgroot);   len = strlen(relpathloc); - for (ix = 0; ix < pd->num_entries && !a; ix++) + for (ix = 0; ix < pd->num_entries && !m; ix++)   {   if (0 != strncmp(relpathloc, pd->entries[ix].name, len))   continue; @@ -325,10 +325,10 @@
  }   }   - if (a) + if (m) + *outStatus = 'M'; + else if (a)   *outStatus = 'A'; - else if (m) - *outStatus = 'M';   else   *outStatus = 'C';