to your diffspec question: if you branch is based on master, then the diffspec would be with master