On Wed, 2008-04-09 at 12:07 -0600, Alex Rousskov wrote: > On Wed, 2008-04-09 at 22:47 +0800, Adrian Chadd wrote: > > I'd really like to see the shuffling around seperated from the integration > > of the tproxy4 code - ie, (at least) two seperate commits. > > I expect separate commits as well. When somebody commits to trunk, they > commit the results of one project.
Separating commits like this can be done for clarity of review. > If there is something in bzr that would combine different merge requests > into one automated commit, it probably would not work right now anyway > because bb automation is broken. I expect pending code to be committed > manually. Please correct me if I am wrong. bb doesn't affect what gets committed, its purely review assistance automation. > > I'm not sure how bzr works with merging in changes from other repos - will > > there be some sort of history included, or just this one patch? > > I do not know if different repositories affect commit history > preservation. Robert? different repositories do not affect commit history preservation; if someone makes a branch on their local disk and does 400 commits to make their feature, when that is committed to trunk you will see a merge which incorporates 400 commits. (Unless the details are deliberately omitted). -Rob
signature.asc
Description: This is a digitally signed message part
