Under "The Parting Glass" I overlooked a copy of the Scots song in D. Herd's 'Scottish Songs', II, 225, 1776. This commences:

O this is my departing time!
For her nae langer maun I stay:

The rest is almost identical to that in SMM #600.