Read about our upcoming Code of Conduct on this issue

Commit c4dd6c99 authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

Restoring topic that was pruned in a way that breaks hg-git

This is a workaround, the TODO explains what should be done.
Some other cases of intentionally pruning a topic should also
be considered.

--HG--
branch : heptapod
parent b0bd9313c6c9
......@@ -1360,6 +1360,10 @@ class GitHandler(object):
ui.note(logprefix, "pruning the published %r" % ref)
new_refs[ref] = ZERO_SHA
else:
# TODO missing case where succctx not on topic
# (example: pruning an old topic with an explicit
# successor that's not on topic because it provides
# the wished functionality)
newctx = self.latest_topic_descendant(topic, succctx)
ui.debug(logprefix,
"updating published %r from %r to %r" % (
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment