Back
[07:42:34] <psha> good morning :)
[17:47:08] <tom3p> #emc
[17:47:18] <tom3p> dang! ate keys again
[17:48:20] <tom3p> i wish buffered input would identify itself as buffered, I'm not that fast a typist
[19:11:11] <CIA-5> EMC: 03micges 07master * r846bdfc27740 10/src/emc/rs274ngc/rs274ngc_return.hh: interp: remove all unused error strings defines
[21:38:15] <micges> jepler, cradek, SWPadnos: I think something is wrong with our git tree, in 2.4_branch there are commits that should be only in master (like separate_g92 commits)
[21:45:01] <jepler> well sh--, I think you're right
[21:56:20] <CIA-5> EMC: 03jepler 07v2.4_branch * r0b98210f6738 10/docs/man/man9/ (hm2_pci.9 hostmot2.9): better 3x20 info in hostmot2 and hm2_pci manpages
[21:58:40] <micges> thanks, seems fixed
[21:58:47] <micges> what was wrong?
[21:58:49] <jepler> I've tried to clean up the damage by rebasing the branch, but anybody who pulled in the meantime has to be REALLY EXTRA CAREFUL because they need to get rid of the undesired commits in their own clone before pushing
[21:59:07] <jepler> someone pushed a commit to the v2.4_branch that had master in its history
[21:59:56] <jepler> based on the people with names on commits since I know the tree was in good shape, it was either me or seb
[22:01:26] <jepler> git didn't see a problem with it, because the commit that was pushed was in the future of v2.4_branch as well
[22:01:59] <jepler> and cia didn't say anything at the time because it specifically does not log commits on a branch that were already in master
[22:03:06] <micges> can you in some way secure it for the future ?
[22:03:42] <jepler> nothing comes immediately to mind
[22:04:42] <Jymmm> jepler: So someone pulled from master, but commited to brach?
[22:05:09] <Jymmm> ^n
[22:06:38] <jepler> there are various scenarios I could imagine, involving git rebase, git merge, or doing git push with unusual arguments
[22:07:14] <jepler> but (in my mind at least) the way to avoid all of those is to make sure to double check by running "git push --dry-run" and then checking the commits to be pushed with "git log" or "gitk" before ever pushing anything
[22:07:26] <jepler> git is like unix, it has a lot of creative ways to do things you didn't mean
[22:08:44] <micges> jepler: remember to commit again your last fixes to 2.4 branch, they're missing now
[22:10:23] <jepler> I didn't intend any of 4c3a2995 through 514a9bcc for v2.4_branch.
[22:11:41] <micges> ok
[22:16:33] <micges> good night all
[22:28:20] <Jymmm> jepler: Maybe a "feature request" for git
[22:28:35] <Jymmm> "Don't allow ppl to muck up master"
[22:55:29] <alex_joni> Jymmm: they can muck up master
[22:55:34] <alex_joni> the stable branches not so much
[22:55:40] <Jymmm> ah
[22:56:48] <SteveStallings> SteveStallings is now known as steves_logging