| #
270415 |
|
23-Aug-2014 |
des |
MFH (r263160): remove lukemftpd
|
| #
267734 |
|
22-Jun-2014 |
gavin |
Merge r267482,r267483,r267486,r267577,r267671,r267672 from head:
Remove send-pr and fix up all references to it. Replace it with a
stub send-pr directing people towards the web site.
|
| #
259073 |
|
07-Dec-2013 |
peter |
Hoist all the mergeinfo up to the root in preparation for enforcing merges
to the root only. All MFC's were rerecorded to the root.
Going forward, if an MFC includes mergeinfo, it will need to be made to
the root and committed from the root. Merges with --ignore-ancestry
or diff | patch can go anywhere.
The mergeinfo in HEAD is in a bad state from years of neglect and manual
tampering and this was branched into 10.x. This confuses the coalescing
code and prevents it from doing its job.
Approved by: re (gjb, implicit)
|
| #
270415 |
|
23-Aug-2014 |
des |
MFH (r263160): remove lukemftpd
|
| #
267734 |
|
22-Jun-2014 |
gavin |
Merge r267482,r267483,r267486,r267577,r267671,r267672 from head:
Remove send-pr and fix up all references to it. Replace it with a
stub send-pr directing people towards the web site.
|
| #
259073 |
|
07-Dec-2013 |
peter |
Hoist all the mergeinfo up to the root in preparation for enforcing merges
to the root only. All MFC's were rerecorded to the root.
Going forward, if an MFC includes mergeinfo, it will need to be made to
the root and committed from the root. Merges with --ignore-ancestry
or diff | patch can go anywhere.
The mergeinfo in HEAD is in a bad state from years of neglect and manual
tampering and this was branched into 10.x. This confuses the coalescing
code and prevents it from doing its job.
Approved by: re (gjb, implicit)
|