Mercurial > hg
comparison mercurial/copies.py @ 45798:ff7e0ca666e8
copies: make sure deleted copy info do not overwriting unrelated ones
See test documentation for details. This is yet another corner case for copy
tracing.
Differential Revision: https://phab.mercurial-scm.org/D9200
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 13 Oct 2020 05:15:44 +0200 |
parents | 7990e7d957b0 |
children | 06b64fabf91c |
comparison
equal
deleted
inserted
replaced
45797:5b6c0af021da | 45798:ff7e0ca666e8 |
---|---|
398 ): | 398 ): |
399 minor[dest] = value | 399 minor[dest] = value |
400 elif changes is not None and dest in changes.merged: | 400 elif changes is not None and dest in changes.merged: |
401 minor[dest] = value | 401 minor[dest] = value |
402 elif not isancestor(new_tt, other_tt): | 402 elif not isancestor(new_tt, other_tt): |
403 minor[dest] = value | 403 if value[1] is not None: |
404 minor[dest] = value | |
405 elif isancestor(other_tt, new_tt): | |
406 minor[dest] = value | |
404 | 407 |
405 | 408 |
406 def _revinfo_getter_extra(repo): | 409 def _revinfo_getter_extra(repo): |
407 """return a function that return multiple data given a <rev>"i | 410 """return a function that return multiple data given a <rev>"i |
408 | 411 |