##// END OF EJS Templates
merge with stable
Matt Mackall -
r16828:8abee656 merge default
parent child Browse files
Show More
@@ -22581,6 +22581,9 b' msgstr "o caminho %r percorre o link simb\xc3\xb3lico %r"'
22581 msgid "could not symlink to %r: %s"
22581 msgid "could not symlink to %r: %s"
22582 msgstr "impossível criar link simbólico para %r: %s"
22582 msgstr "impossível criar link simbólico para %r: %s"
22583
22583
22584 msgid "empty revision range"
22585 msgstr "faixa de revisões vazia"
22586
22584 #, python-format
22587 #, python-format
22585 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
22588 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
22586 msgstr "gravando remoção de %s como renomeação para %s (%d%% de similaridade)\n"
22589 msgstr "gravando remoção de %s como renomeação para %s (%d%% de similaridade)\n"
@@ -838,6 +838,9 b' class localrepository(repo.repository):'
838 self.sjoin('phaseroots'))
838 self.sjoin('phaseroots'))
839 self.invalidate()
839 self.invalidate()
840
840
841 # Discard all cache entries to force reloading everything.
842 self._filecache.clear()
843
841 parentgone = (parents[0] not in self.changelog.nodemap or
844 parentgone = (parents[0] not in self.changelog.nodemap or
842 parents[1] not in self.changelog.nodemap)
845 parents[1] not in self.changelog.nodemap)
843 if parentgone:
846 if parentgone:
@@ -1320,9 +1323,6 b' class localrepository(repo.repository):'
1320 # tag cache retrieval" case to work.
1323 # tag cache retrieval" case to work.
1321 self.invalidatecaches()
1324 self.invalidatecaches()
1322
1325
1323 # Discard all cache entries to force reloading everything.
1324 self._filecache.clear()
1325
1326 def walk(self, match, node=None):
1326 def walk(self, match, node=None):
1327 '''
1327 '''
1328 walk recursively through the directory tree or a given
1328 walk recursively through the directory tree or a given
@@ -1345,7 +1345,16 b' def _applydiff(ui, fp, patcher, backend,'
1345 elif state == 'git':
1345 elif state == 'git':
1346 for gp in values:
1346 for gp in values:
1347 path = pstrip(gp.oldpath)
1347 path = pstrip(gp.oldpath)
1348 try:
1348 data, mode = backend.getfile(path)
1349 data, mode = backend.getfile(path)
1350 except IOError, e:
1351 if e.errno != errno.ENOENT:
1352 raise
1353 # The error ignored here will trigger a getfile()
1354 # error in a place more appropriate for error
1355 # handling, and will not interrupt the patching
1356 # process.
1357 else:
1349 store.setfile(path, data, mode)
1358 store.setfile(path, data, mode)
1350 else:
1359 else:
1351 raise util.Abort(_('unsupported parser state: %s') % state)
1360 raise util.Abort(_('unsupported parser state: %s') % state)
@@ -569,7 +569,7 b' def revrange(repo, revs):'
569 newrevs = set(xrange(start, end + step, step))
569 newrevs = set(xrange(start, end + step, step))
570 if seen:
570 if seen:
571 newrevs.difference_update(seen)
571 newrevs.difference_update(seen)
572 seen.union(newrevs)
572 seen.update(newrevs)
573 else:
573 else:
574 seen = newrevs
574 seen = newrevs
575 l.extend(sorted(newrevs, reverse=start > end))
575 l.extend(sorted(newrevs, reverse=start > end))
@@ -73,6 +73,53 b' Display rejections:'
73 +c
73 +c
74 +c
74 +c
75
75
76 Test missing renamed file
77
78 $ hg qpop
79 popping changeb
80 patch queue now empty
81 $ hg up -qC 0
82 $ echo a > a
83 $ hg mv b bb
84 $ python ../writelines.py bb 2 'b\n' 10 'a\n' 2 'c\n'
85 $ echo c > c
86 $ hg add a c
87 $ hg qnew changebb
88 $ hg qpop
89 popping changebb
90 patch queue now empty
91 $ hg up -qC 1
92 $ hg qpush
93 applying changebb
94 patching file bb
95 Hunk #1 FAILED at 0
96 Hunk #2 FAILED at 7
97 2 out of 2 hunks FAILED -- saving rejects to file bb.rej
98 b not tracked!
99 patch failed, unable to continue (try -v)
100 patch failed, rejects left in working dir
101 errors during apply, please fix and refresh changebb
102 [2]
103 $ cat a
104 a
105 $ cat c
106 c
107 $ cat bb.rej
108 --- bb
109 +++ bb
110 @@ -1,3 +1,5 @@
111 +b
112 +b
113 a
114 a
115 a
116 @@ -8,3 +10,5 @@
117 a
118 a
119 a
120 +c
121 +c
122
76 $ cd ..
123 $ cd ..
77
124
78
125
General Comments 0
You need to be logged in to leave comments. Login now