Could I get review for: #412 backup cannot safely restore an uncommitted merge, should refuse to try
Webrev: http://cr.opensolaris.org/~richlowe/scm_412 Bug: http://bugs.grommit.com/show_bug.cgi?id=412 There's some notes in the bug as to why this must be done, but they're perhaps not coherent. The important information is that, at present, we do not know of a way to validly restore an uncommitted merge that does not either lose (uncommitted) data, or risk losing uncommitted data. It would be better to actively prevent this being done than to allow it and attempt to pick up the pieces afterward. It is unclear whether a way to actually allow this can be devised, but should it be possible, it will be dealt with under a subsequent bug. -- Rich
