Siddharth Agarwal <sid0@fb.com> [Wed, 03 Feb 2016 09:23:31 -0800] rev 27977
rebase: don't preserve most extra fields
This backs out changeset 88fde8db5307.
See the previous patches for why.
Siddharth Agarwal <sid0@fb.com> [Wed, 03 Feb 2016 09:24:47 -0800] rev 27976
rebase: backout changeset d755a9531fce
This is a dependency for a future backout of 88fde8db5307.
See the previous patches for why.
Siddharth Agarwal <sid0@fb.com> [Wed, 03 Feb 2016 09:23:52 -0800] rev 27975
rebase: backout changeset 986d04b9fedd
This is a dependency for a future backout of 88fde8db5307.
See the previous patches for why.
Siddharth Agarwal <sid0@fb.com> [Wed, 03 Feb 2016 09:06:52 -0800] rev 27974
graft: don't preserve most extra fields
This backs out changeset 804abe8999f3.
See the previous patch for why we're doing this.
Siddharth Agarwal <sid0@fb.com> [Wed, 03 Feb 2016 08:59:46 -0800] rev 27973
amend: don't preserve most extra fields
This backs out changeset 39163708825cd.
There are some extra fields that absolutely should not be preserved, like the
convert_revision field introduced by the convert and hgsubversion extensions.
The problem with extensions blacklisting certain extra fields is that they
might not be enabled at the time the amend is performed.
In the long run we probably want separately marked transferable and
non-transferable extra fields, but for now restore the old Mercurial 3.6
behavior.
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 03 Feb 2016 11:01:11 -0200] rev 27972
histedit: fix typo in documentation
Yuya Nishihara <yuya@tcha.org> [Wed, 03 Feb 2016 22:47:27 +0900] rev 27971
osutil: do not abort loading pure module just because libc has no recvmsg()
On Solaris, recvmsg() is provided by libsocket.so. We could try hard to look
for the library which provides 'recvmsg' symbol, but it would make little sense
now since recvfds() won't work anyway on Solaris. So this patch just disables
_recvmsg() on such platforms.
Thanks to FUJIWARA Katsunori for spotting this problem.
Yuya Nishihara <yuya@tcha.org> [Tue, 02 Feb 2016 20:56:48 +0900] rev 27970
osutil: disable compilation of recvfds() on unsupported platforms
It appears that Solaris doesn't provide CMSG_LEN(), msg_control, etc. As
recvfds() is only necessary for chg, this patch just drops it if CMSG_LEN
isn't defined, which is the same workaround as Python 3.x.
https://hg.python.org/cpython/rev/c64216addd7f#l7.33
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 03 Feb 2016 10:57:27 -0200] rev 27969
i18n-pt_BR: synchronized with 0ec12435b78b
Matt Mackall <mpm@selenic.com> [Mon, 01 Feb 2016 18:29:07 -0600] rev 27968
merge with stable