Print

Print


Jacek,

	Two things:

 + Rebasing history that has already been pushed is problematic.  I can
see this for u/ branches, but it's more questionable for tickets/
branches.  It messes up other people's history.

 + You need to build and test after your rebase and cleanup.  You can do
this after pushing your ticket but before merging to master (possibly
using buildbot), or you can do the merge to master locally and test
there before pushing the new master.  But assuming that the cleanup had
no impact is dangerous.

	I think "clean history" is somewhat in the eye of the beholder.
I think the main way to maintain a useful history is to never merge from
master/next/integration into a ticket branch.  Rebasing of the sort you
have described seems to me to just avoid parallel branches, at possibly
significant cost.

-- 
Kian-Tat Lim, LSST Data Management, [log in to unmask]

########################################################################
Use REPLY-ALL to reply to list

To unsubscribe from the QSERV-L list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1