* Cope with packages with epoch. Closes: #720897.
* Add Closes line for #720595 to changelog entry for 0.11.
+ * Improve error message for non-fast-forward push. Closes: #720896.
--
git_fetch_us();
}
if (fetch_from_archive()) {
- is_fast_fwd(lrref(), 'HEAD') or die;
+ is_fast_fwd(lrref(), 'HEAD') or
+ fail "dgit push: HEAD is not a descendant".
+ " of the archive's version.\n".
+ "$us: To overwrite it, use git-merge -s ours ".lrref().".";
} else {
$new_package or
fail "package appears to be new in this suite;".