 |
 |
Hello, History rewriting seems to be an interesting feature. Indeed it allows the developer to create more consistent commits before doing the merge to master. Indeed, commits made on the fly during the development process can be sometime quite chaotic until the whole feature isn't finished, and tested. These "chaotic" commits are nevertheless very usefull because it allows the developper to easily go back and forth, at a small granularity, in its current development task. I think this git feature increase a lot developer productivity. Jacek rebasing procedure proposal seems very usefull and I think it is convenient to have a well-defined, documented and doable procedure in order to support history rewriting, when this feature is needed. Nevertheless, for now, it seems that next command : git push tickets/DM-XX --force isn't allowed for devs by gitolite access rights : https://dev.lsstcorp.org/trac/wiki/GitDemoAndTutorial#Fullgitoliteconfigfile Indeed RWC doesn't allow --force : RWC tickets/[0-9]+$ = @devs # Allow creating and pushing to tickets So at least two diffent solutions would work here : - enable RW+ right to ticket branch creator - start developing in u/user/DM-xxx and do the rebase in tickets/DM-xxx ? That's why, if history rewriting is considered as a required feature, it seems that an "official" and common procedure for doing it would be very usefull. Cheers, Fabrice On Wed, May 21, 2014 6:45 am, Jacek Becla wrote: >> So I guess maybe I'm saying the problem really starts earlier, >> with too much being done on each ticket. > > Nope! Even if I have a small ticket, say it is only 1 hour > worth of work, if I branch off master, do my work, and someone else changes > master in the meantime... if I push my changes without proper merging or > rebasing, the history will get convoluted. > > Jacek > _______________________________________________ > LSST-data mailing list > [log in to unmask] > http://listserv.lsstcorp.org/mailman/listinfo/lsst-data > > ######################################################################## 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