Show More
@@ -1063,15 +1063,16 b' class committablectx(basectx):' | |||||
1063 | def _manifest(self): |
|
1063 | def _manifest(self): | |
1064 | """generate a manifest corresponding to the values in self._status""" |
|
1064 | """generate a manifest corresponding to the values in self._status""" | |
1065 |
|
1065 | |||
1066 |
man = self._parents[0].manifest() |
|
1066 | man1 = self._parents[0].manifest() | |
|
1067 | man = man1.copy() | |||
1067 | if len(self._parents) > 1: |
|
1068 | if len(self._parents) > 1: | |
1068 | man2 = self.p2().manifest() |
|
1069 | man2 = self.p2().manifest() | |
1069 | def getman(f): |
|
1070 | def getman(f): | |
1070 | if f in man: |
|
1071 | if f in man1: | |
1071 | return man |
|
1072 | return man1 | |
1072 | return man2 |
|
1073 | return man2 | |
1073 | else: |
|
1074 | else: | |
1074 | getman = lambda f: man |
|
1075 | getman = lambda f: man1 | |
1075 |
|
1076 | |||
1076 | copied = self._repo.dirstate.copies() |
|
1077 | copied = self._repo.dirstate.copies() | |
1077 | ff = self._flagfunc |
|
1078 | ff = self._flagfunc |
@@ -584,7 +584,8 b' overwriting with renames (issue1959)' | |||||
584 | copy from d1/a |
|
584 | copy from d1/a | |
585 | copy to d1/c |
|
585 | copy to d1/c | |
586 | $ hg update -C |
|
586 | $ hg update -C | |
587 |
2 files updated, 0 files merged, |
|
587 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
588 | $ rm d1/c # The file was marked as added, so 'hg update' action was 'forget' | |||
588 |
|
589 | |||
589 | check illegal path components |
|
590 | check illegal path components | |
590 |
|
591 |
General Comments 0
You need to be logged in to leave comments.
Login now