Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 2065:2ff37e3bf780

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix update when a locally added file match the target revision the dirstate entry for the added file wasn't updated. fix issue207
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 14 Apr 2006 00:41:50 +0200
parents a514c7509fa9
children f71e9656524f
comparison
equal deleted inserted replaced
2064:547ede0123a2 2065:2ff37e3bf780
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)