equal
deleted
inserted
replaced
1571 # or are we going back in time? |
1571 # or are we going back in time? |
1572 elif force or m2[f] != a or (p2 == pa and mw[f] == m1[f]): |
1572 elif force or m2[f] != a or (p2 == pa and mw[f] == m1[f]): |
1573 self.ui.debug(_(" remote %s is newer, get\n") % f) |
1573 self.ui.debug(_(" remote %s is newer, get\n") % f) |
1574 get[f] = m2[f] |
1574 get[f] = m2[f] |
1575 s = 1 |
1575 s = 1 |
1576 elif f in umap: |
1576 elif f in umap or f in added: |
1577 # this unknown file is the same as the checkout |
1577 # this unknown file is the same as the checkout |
|
1578 # we need to reset the dirstate if the file was added |
1578 get[f] = m2[f] |
1579 get[f] = m2[f] |
1579 |
1580 |
1580 if not s and mfw[f] != mf2[f]: |
1581 if not s and mfw[f] != mf2[f]: |
1581 if force: |
1582 if force: |
1582 self.ui.debug(_(" updating permissions for %s\n") % f) |
1583 self.ui.debug(_(" updating permissions for %s\n") % f) |