asf - Revision 1917883: /subversion/branches/shelve-checkpoint/notes/merge-tracking