>
> Beats me. In the system we discussed and that I mostly implemented (where
> the changes necessary to make a commit apply were tracked by the rake task)
> the answer would have been yes; they would have been kept (as an indexed
> collection of diffs).
>
well, either way, I think we need to be very careful when rebasing off of
testing.
if testing looks like this today:
testing = Master + FeatureA + FeatureB
and I rebase something off of it like so:
jesse:featureC = Master + FeatureA + FeatureB + FeatureC
and you accept that branch, everything is okay:
luke:featureA succeeded:
7fab7d2 this is the FeatureA commit
luke:featureB succeeded:
669831f this is the FeatureB commit
jesse:featureC succeeded:
ebfe4d8 this is the FeatureC commit
later, FeatureB gets canceled. so, you want:
testing = Master + FeatureA + FeatureC
but FeatureB's commits are in the history of FeatureC, so you actually get:
luke:featureA succeeded:
7fab7d2 this is the FeatureA commit
jesse:featureC succeeded:
669831f this is the FeatureB commit
ebfe4d8 this is the FeatureC commit
We should make sure to keep an eye on the logs for things bringing in
patches we didn't expect.
~Jesse
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
