##// END OF EJS Templates
absorb: be more specific when erroring out on merge commit...
absorb: be more specific when erroring out on merge commit When you have a merge commit checked out and run `hg absorb`, it would tell you abort: no mutable changeset to change That makes it sound like the problem is public commits when isn't really. Let's be more specific in this case. There was already a test case that test this, so that now prints the new message. I added a new test case that shows the old message (when a public commit is checked out). Differential Revision: https://phab.mercurial-scm.org/D6354

File last commit:

r41534:8427fea0 stable
r42452:b3fc78c0 default
Show More
copyright
27 lines | 1.0 KiB | text/plain | TextLexer
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
r38029 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: mercurial
Source: https://www.mercurial-scm.org/
Files: *
av6
copyright: update to 2019...
r41534 Copyright: 2005-2019, Matt Mackall <mpm@selenic.com> and others.
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
r38029 License: GPL-2+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later
version.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
.
You should have received a copy of the GNU General Public
License along with this package; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301 USA
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.