On 11/07/16 16:33, Andrew Hughes wrote: >>> On 11/07/16 15:28, Andrew Hughes wrote: >>> I don't really want to lose all the history with just one huge >>> patch either. >> >> In practice, from merging in ports, that is by far the best thing >> to do. The history can be found in the development tree. > > That's certainly not my experience. Having the history available > on the working tree has proved invaluable on several occasions.
I'm sure, but it makes an awful mess of the history of the tree being merged into. No. Andrew.
