All development commits happen on branches. We mandate entering defect numbers in commit log. But, once the branches are merged to trunk, there are no records of the defect numbers. I am looking for some advise on tracking defects that are part of a build done from trunk.