equal
deleted
inserted
replaced
1592 # or are we going back in time? |
1592 # or are we going back in time? |
1593 elif force or m2[f] != a or (p2 == pa and mw[f] == m1[f]): |
1593 elif force or m2[f] != a or (p2 == pa and mw[f] == m1[f]): |
1594 self.ui.debug(_(" remote %s is newer, get\n") % f) |
1594 self.ui.debug(_(" remote %s is newer, get\n") % f) |
1595 get[f] = m2[f] |
1595 get[f] = m2[f] |
1596 s = 1 |
1596 s = 1 |
1597 elif f in umap: |
1597 elif f in umap or f in added: |
1598 # this unknown file is the same as the checkout |
1598 # this unknown file is the same as the checkout |
|
1599 # we need to reset the dirstate if the file was added |
1599 get[f] = m2[f] |
1600 get[f] = m2[f] |
1600 |
1601 |
1601 if not s and mfw[f] != mf2[f]: |
1602 if not s and mfw[f] != mf2[f]: |
1602 if force: |
1603 if force: |
1603 self.ui.debug(_(" updating permissions for %s\n") % f) |
1604 self.ui.debug(_(" updating permissions for %s\n") % f) |