Show More
@@ -140,16 +140,17 b' class basectx(object):' | |||||
140 | deletedset = set(deleted) |
|
140 | deletedset = set(deleted) | |
141 | withflags = mf1.withflags() | mf2.withflags() |
|
141 | withflags = mf1.withflags() | mf2.withflags() | |
142 | for fn, mf2node in mf2.iteritems(): |
|
142 | for fn, mf2node in mf2.iteritems(): | |
|
143 | if fn in deletedset: | |||
|
144 | continue | |||
143 | if fn in mf1: |
|
145 | if fn in mf1: | |
144 | if (fn not in deletedset and |
|
146 | if ((fn in withflags and mf1.flags(fn) != mf2.flags(fn)) or | |
145 | ((fn in withflags and mf1.flags(fn) != mf2.flags(fn)) or |
|
|||
146 | (mf1[fn] != mf2node and |
|
147 | (mf1[fn] != mf2node and | |
147 |
(mf2node != _newnode or self[fn].cmp(other[fn])))) |
|
148 | (mf2node != _newnode or self[fn].cmp(other[fn])))): | |
148 | modified.append(fn) |
|
149 | modified.append(fn) | |
149 | elif listclean: |
|
150 | elif listclean: | |
150 | clean.append(fn) |
|
151 | clean.append(fn) | |
151 | del mf1[fn] |
|
152 | del mf1[fn] | |
152 |
el |
|
153 | else: | |
153 | added.append(fn) |
|
154 | added.append(fn) | |
154 | removed = mf1.keys() |
|
155 | removed = mf1.keys() | |
155 | if removed: |
|
156 | if removed: |
@@ -153,13 +153,10 b' BROKEN: missing_content2_content[23]-unt' | |||||
153 | R content1_missing_content1-untracked |
|
153 | R content1_missing_content1-untracked | |
154 | R content1_missing_content3-untracked |
|
154 | R content1_missing_content3-untracked | |
155 | R content1_missing_missing-untracked |
|
155 | R content1_missing_missing-untracked | |
156 | BROKEN: content1_content*_missing-tracked appear twice; should just be '!' |
|
|||
157 | $ hg status -A --rev 0 'glob:*_*_missing-tracked' |
|
156 | $ hg status -A --rev 0 'glob:*_*_missing-tracked' | |
158 | ! content1_content1_missing-tracked |
|
157 | ! content1_content1_missing-tracked | |
159 | ! content1_content2_missing-tracked |
|
158 | ! content1_content2_missing-tracked | |
160 | ! content1_missing_missing-tracked |
|
159 | ! content1_missing_missing-tracked | |
161 | ! missing_content2_missing-tracked |
|
160 | ! missing_content2_missing-tracked | |
162 | ! missing_missing_missing-tracked |
|
161 | ! missing_missing_missing-tracked | |
163 | C content1_content1_missing-tracked |
|
|||
164 | C content1_content2_missing-tracked |
|
|||
165 | $ hg status -A --rev 0 'glob:missing_*_missing-untracked' |
|
162 | $ hg status -A --rev 0 'glob:missing_*_missing-untracked' |
General Comments 0
You need to be logged in to leave comments.
Login now