I have some code rotting somewhere in a repository where I was doing several moves to organise some stuff.

Ages after I wrote I realised it was basically this problem and a standard algorithm could apply.