Show More
@@ -2642,7 +2642,7 b' class localrepository(object):' | |||||
2642 | p1.manifestnode(), p2.manifestnode(), |
|
2642 | p1.manifestnode(), p2.manifestnode(), | |
2643 | added, drop, match=self.narrowmatch()) |
|
2643 | added, drop, match=self.narrowmatch()) | |
2644 | else: |
|
2644 | else: | |
2645 |
self.ui.debug('reusing manifest f |
|
2645 | self.ui.debug('reusing manifest from p1 (listed files ' | |
2646 | 'actually unchanged)\n') |
|
2646 | 'actually unchanged)\n') | |
2647 | mn = p1.manifestnode() |
|
2647 | mn = p1.manifestnode() | |
2648 | else: |
|
2648 | else: |
@@ -755,7 +755,7 b' Transplants of grafts can find a destina' | |||||
755 | committing files: |
|
755 | committing files: | |
756 | b |
|
756 | b | |
757 | warning: can't find ancestor for 'b' copied from 'a'! |
|
757 | warning: can't find ancestor for 'b' copied from 'a'! | |
758 |
reusing manifest f |
|
758 | reusing manifest from p1 (listed files actually unchanged) | |
759 | committing changelog |
|
759 | committing changelog | |
760 | updating the branch cache |
|
760 | updating the branch cache | |
761 | $ hg log -r 'destination(13)' |
|
761 | $ hg log -r 'destination(13)' |
@@ -137,7 +137,7 b' An identical file added at both parents,' | |||||
137 | $ hg ci --debug -m merge |
|
137 | $ hg ci --debug -m merge | |
138 | committing files: |
|
138 | committing files: | |
139 | b |
|
139 | b | |
140 |
reusing manifest f |
|
140 | reusing manifest from p1 (listed files actually unchanged) | |
141 | committing changelog |
|
141 | committing changelog | |
142 | updating the branch cache |
|
142 | updating the branch cache | |
143 | committed changeset 3:c8d50407916ef8a5a97cb6e36ca9bc844a6ee13e |
|
143 | committed changeset 3:c8d50407916ef8a5a97cb6e36ca9bc844a6ee13e |
General Comments 0
You need to be logged in to leave comments.
Login now