Ok, so effectively head of tomee-1.7.x got shifted back a number of commits (git reset --hard HEAD^X, or something similar, right?). So those commits are still there "somewhere" but not visible within tomee-1.7.x. Got it. A revert may have given us a bit of a clearer view in the history as to what happened, but I understand why this route was taken. If the commits are still there somewhere, then I suspect that is ok. Generally I'd hope this would be a rare exception and we'd normally do a revert (sounds like that is the case).
Jon On Mon, Dec 5, 2016 at 11:09 AM, Romain Manni-Bucau <[email protected]> wrote: > 2016-12-05 12:06 GMT+01:00 Jonathan Gallimore < > [email protected]> > : > > > No issue with the "noise", but thanks for heads up. > > > > One question - did we *delete* history? There's certainly commits I did > > after September 16th but before December 4th which are no-where to be > seen > > here. I didn't even know you could do that. Irrespective of whatever > issues > > there are with what I committed, should we ever do that? I'd have > thought a > > revert would be better. > > > > > My script kind of overwrite the 1.7 with 7.x history so revert was not > enough. JL pushed back the 1.7 branch until the history he got which was > the one i wanted to start from. > > > > Jon > > > > On Sat, Dec 3, 2016 at 5:02 PM, Romain Manni-Bucau < > [email protected]> > > wrote: > > > > > Hi guys, > > > > > > sorry for the noise on commit list but messed up a git script (to merge > > > features from master) and lost part of 1.7.x. JL helped me to revert it > > and > > > fix it so we should be as expected now. > > > > > > Romain Manni-Bucau > > > @rmannibucau <https://twitter.com/rmannibucau> | Blog > > > <https://blog-rmannibucau.rhcloud.com> | Old Blog > > > <http://rmannibucau.wordpress.com> | Github <https://github.com/ > > > rmannibucau> | > > > LinkedIn <https://www.linkedin.com/in/rmannibucau> | JavaEE Factory > > > <https://javaeefactory-rmannibucau.rhcloud.com> > > > > > >
