##// END OF EJS Templates
dirstate.status: if a file is marked as copied, consider it modified...
Alexis S. L. Carvalho -
r4677:de8ec7e1 default
parent child Browse files
Show More
@@ -472,8 +472,9 b' class dirstate(object):'
472 if type_ == 'n':
472 if type_ == 'n':
473 if not st:
473 if not st:
474 st = os.lstat(self.wjoin(fn))
474 st = os.lstat(self.wjoin(fn))
475 if size >= 0 and (size != st.st_size
475 if (size >= 0 and (size != st.st_size
476 or (mode ^ st.st_mode) & 0100):
476 or (mode ^ st.st_mode) & 0100)
477 or fn in self._copymap):
477 modified.append(fn)
478 modified.append(fn)
478 elif time != int(st.st_mtime):
479 elif time != int(st.st_mtime):
479 lookup.append(fn)
480 lookup.append(fn)
@@ -44,4 +44,10 b' hg add baz'
44 hg cp -A bar baz
44 hg cp -A bar baz
45 hg st -C
45 hg st -C
46
46
47 echo "# foo was clean:"
48 hg st -AC foo
49 echo "# but it's considered modified after a copy --after --force"
50 hg copy -Af bar foo
51 hg st -AC foo
52
47 exit 0
53 exit 0
@@ -23,3 +23,8 b' bar renamed from foo:dd12c926cf165e3eb4c'
23 # copy --after on an added file
23 # copy --after on an added file
24 A baz
24 A baz
25 bar
25 bar
26 # foo was clean:
27 C foo
28 # but it's considered modified after a copy --after --force
29 M foo
30 bar
General Comments 0
You need to be logged in to leave comments. Login now