Show More
@@ -451,11 +451,7 b' class dirstate(object):' | |||||
451 | '''Mark a file merged.''' |
|
451 | '''Mark a file merged.''' | |
452 | if self._pl[1] == nullid: |
|
452 | if self._pl[1] == nullid: | |
453 | return self.normallookup(f) |
|
453 | return self.normallookup(f) | |
454 | s = os.lstat(self._join(f)) |
|
454 | return self.otherparent(f) | |
455 | self._addpath(f, 'm', s.st_mode, |
|
|||
456 | s.st_size & _rangemask, int(s.st_mtime) & _rangemask) |
|
|||
457 | if f in self._copymap: |
|
|||
458 | del self._copymap[f] |
|
|||
459 |
|
455 | |||
460 | def drop(self, f): |
|
456 | def drop(self, f): | |
461 | '''Drop a file from the dirstate''' |
|
457 | '''Drop a file from the dirstate''' |
@@ -92,7 +92,7 b' Graft a rename:' | |||||
92 | HG: -- |
|
92 | HG: -- | |
93 | HG: user: foo |
|
93 | HG: user: foo | |
94 | HG: branch 'default' |
|
94 | HG: branch 'default' | |
95 |
HG: |
|
95 | HG: added b | |
96 | HG: removed a |
|
96 | HG: removed a | |
97 | $ hg export tip --git |
|
97 | $ hg export tip --git | |
98 | # HG changeset patch |
|
98 | # HG changeset patch |
@@ -22,7 +22,7 b'' | |||||
22 |
|
22 | |||
23 | $ hg debugstate --nodates |
|
23 | $ hg debugstate --nodates | |
24 | m 0 -2 bar |
|
24 | m 0 -2 bar | |
25 |
m |
|
25 | m 0 -2 foo1 | |
26 | copy: foo -> foo1 |
|
26 | copy: foo -> foo1 | |
27 |
|
27 | |||
28 | $ hg st -q |
|
28 | $ hg st -q | |
@@ -55,8 +55,8 b' Re-adding foo1 and bar:' | |||||
55 | adding foo1 |
|
55 | adding foo1 | |
56 |
|
56 | |||
57 | $ hg debugstate --nodates |
|
57 | $ hg debugstate --nodates | |
58 |
|
|
58 | n 0 -2 bar | |
59 |
|
|
59 | n 0 -2 foo1 | |
60 | copy: foo -> foo1 |
|
60 | copy: foo -> foo1 | |
61 |
|
61 | |||
62 | $ hg st -qC |
|
62 | $ hg st -qC | |
@@ -74,8 +74,8 b' Reverting foo1 and bar:' | |||||
74 | reverting foo1 |
|
74 | reverting foo1 | |
75 |
|
75 | |||
76 | $ hg debugstate --nodates |
|
76 | $ hg debugstate --nodates | |
77 |
|
|
77 | n 0 -2 bar | |
78 |
|
|
78 | n 0 -2 foo1 | |
79 | copy: foo -> foo1 |
|
79 | copy: foo -> foo1 | |
80 |
|
80 | |||
81 | $ hg st -qC |
|
81 | $ hg st -qC |
General Comments 0
You need to be logged in to leave comments.
Login now