On Tue, Jan 19, 2010 at 02:10:48PM +1300, Andrew Thorburn wrote:
> I have a particular bit of code in a project I'm working on which is
> very large (too large), and I frequently need to make changes to it
> for multiple issues. This means that when I go to commit, I have to
> make a single commit which fixes or implements multiple issues. This
> isn't really ideal, as it means that you can't look at the diffs of
> the file to see which change applies to which issue - you just see a
> nice big list of changes, and have to guess at what changes apply to
> what issue.
I would use a shelf (or branch). Copy the file from trunk, make change
#1, commit to shelf, make change #2, commit to shelf, etc.
Then when you know what changes are actually needed, you can merge them
one-by-one back to trunk.
Received on 2010-01-19 17:35:41 CET