Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 4820:9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Jul 2007 16:01:07 -0500 |
parents | 8808ea7da86b |
children | 931f901ab811 |
line wrap: on
line diff
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -478,6 +478,9 @@ def recordupdates(repo, action, branchme repo.dirstate.forget([f]) elif m == "d": # directory rename f2, fd, flag = a[2:] + if not f2 and f not in repo.dirstate: + # untracked file moved + continue if branchmerge: repo.dirstate.update([fd], 'a') if f: