diff contrib/editmerge @ 39889:d9ba836fc234

shelve: find shelvedctx from bundle even if they are already in the repo We use the new "duplicates" node tracking to find the tip of the bundle even if it already exists in the repository. Such logic is not supposed to be needed in theory. If the shelve was made using internal-phase, we already know its node. Otherwise, the bundle content should have been stripped. However, handling it makes the shelve code more robust and provide a good example of "revduplicates" usage.
author Boris Feld <boris.feld@octobus.net>
date Thu, 20 Sep 2018 17:47:05 +0200
parents 612502900a2d
children
line wrap: on
line diff