# HG changeset patch # User mason@suse.com # Date 1123869479 28800 # Node ID 4480e035d838cc79564f3ebe3938b024d2c7cbc5 # Parent 9a0af739cf55634eff94f2fb84d5bf322bf283db addremove was not correctly finding removed files when given a list of files to look at. These end up with a src of 'f' from walk() but no longer exist on the filesystem. Index: mine/mercurial/commands.py =================================================================== diff -r 9a0af739cf55 -r 4480e035d838 mercurial/commands.py --- a/mercurial/commands.py Fri Aug 12 09:57:56 2005 -0800 +++ b/mercurial/commands.py Fri Aug 12 09:57:59 2005 -0800 @@ -396,11 +396,10 @@ q = dict(zip(pats, pats)) add, remove = [], [] for src, abs, rel in walk(repo, pats, opts): - if src == 'f': - if repo.dirstate.state(abs) == '?': - add.append(abs) - if rel not in q: ui.status('adding ', rel, '\n') - elif repo.dirstate.state(abs) != 'r' and not os.path.exists(rel): + if src == 'f' and repo.dirstate.state(abs) == '?': + add.append(abs) + if rel not in q: ui.status('adding ', rel, '\n') + if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel): remove.append(abs) if rel not in q: ui.status('removing ', rel, '\n') repo.add(add)