diff -r e7d3b509af8b -r 08a0f04b56bd mercurial/copies.py --- a/mercurial/copies.py Mon Jan 25 00:05:22 2010 -0600 +++ b/mercurial/copies.py Mon Jan 25 00:05:27 2010 -0600 @@ -190,8 +190,10 @@ repo.ui.debug(" all copies found (* = to merge, ! = divergent):\n") for f in fullcopy: note = "" - if f in copy: note += "*" - if f in diverge2: note += "!" + if f in copy: + note += "*" + if f in diverge2: + note += "!" repo.ui.debug(" %s -> %s %s\n" % (f, fullcopy[f], note)) del diverge2