Mercurial > hg
comparison mercurial/merge.py @ 6268:7e4f66fe964b
merge: notice uncommited copies (issue1000)
As mentioned in msg5349 in issue988, "hg update" doesn't take into account
uncommitted copies. To reproduce:
----------------
hg init repo
cd repo
touch foo
hg ci -Am 'add foo'
echo >> foo
hg ci -m 'change foo'
hg up -C 0
hg mv foo bar
HGMERGE=false thg --debug -y update
--------------------------
A similar problem happens with hg merge --force.
I'm attaching a possible patch.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 14 Mar 2008 11:01:31 -0500 |
parents | 69c75d063c7a |
children | ffdf70e74623 |
comparison
equal
deleted
inserted
replaced
6267:d036ea711140 | 6268:7e4f66fe964b |
---|---|
104 if s in seen: | 104 if s in seen: |
105 continue | 105 continue |
106 seen[s] = 1 | 106 seen[s] = 1 |
107 if fc.path() != orig and fc.path() not in old: | 107 if fc.path() != orig and fc.path() not in old: |
108 old[fc.path()] = 1 | 108 old[fc.path()] = 1 |
109 if fc.rev() < limit: | 109 if fc.rev() < limit and fc.rev() is not None: |
110 continue | 110 continue |
111 visit += fc.parents() | 111 visit += fc.parents() |
112 | 112 |
113 old = old.keys() | 113 old = old.keys() |
114 old.sort() | 114 old.sort() |