diff mercurial/copies.py @ 24110:756c5c8331b0 stable

subrepo: add tests for change/remove conflicts There are currently no tests for change/remove conflicts of subrepos, and it's pretty broken. Add some tests demonstrating some of the breakages and fix the most obvious one (a KeyError when trying to look up a subrepo in the wrong context).
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 17 Feb 2015 23:20:55 -0800
parents 751d1138ce35
children a63c2b159df4 9372180b8c9b
line wrap: on
line diff