Separate songs by purpose
Create one repertoire for the songs you are learning and another for material that is performance-ready.
Keep playing notes
Use repertoire notes for reminders such as an alternate capo position, a difficult transition or the key preferred by a singer.