I’m not even trying to co-mingle tests and src rig...
# generalf
fierce-park-88503
04/06/2019, 5:08 PMI’m not even trying to co-mingle tests and src right now, just moving src/python/my_org to ROOT/my_org and moving tests/python/my_org_test to ROOT/my_org_test
a
aloof-angle-91616
04/06/2019, 10:49 PMi don't know if i can see any blockers to just doing that -- are you finding issues when you try? you should be able to move things like you describe and have it just work
f
fierce-park-88503
04/07/2019, 1:27 AMone issue is that you mess up any in-flight changes. which is kind of annoying but not the end of the world
n
nutritious-monkey-78516
04/07/2019, 5:28 AMHave you tried to use source_roots?
f
fierce-park-88503
04/08/2019, 2:49 AMNot sure what you mean.
src/pythonfierce-park-88503
04/08/2019, 7:22 PM@aloof-angle-91616 I definitely annoyed a few people w/ merge conflicts, lol.
a
aloof-angle-91616
04/08/2019, 7:22 PMhey sorry
aloof-angle-91616
04/08/2019, 7:23 PMmoving code will do that i guess
f
fierce-park-88503
04/08/2019, 7:24 PMit’s not that bad though, the merge fix is just like, merge up to right before the change as normal, merge the move, resolve the merge by just blindly moving/renaming.
a
aloof-angle-91616
04/08/2019, 7:24 PMit might be possible to
cp -raloof-angle-91616
04/08/2019, 7:24 PMthat's more developed than what i had thought, great
aloof-angle-91616
04/08/2019, 7:24 PMare the conflicts resolved now?
f
fierce-park-88503
04/08/2019, 7:25 PMnot sure, have to catch up with the folks who had the in-flight changes
fierce-park-88503
04/08/2019, 7:25 PMthey’re temporarily stopped yelling at me though, so 👍
👍 1
a
aloof-angle-91616
04/08/2019, 7:26 PMi would love to pitch in if people start yelling again
f
fierce-park-88503
04/08/2019, 7:27 PMwe work at different companies so that might be difficult 😛
fierce-park-88503
04/08/2019, 7:27 PMappreciate the offer though
a
aloof-angle-91616
04/08/2019, 7:27 PMjust in terms of pants help!
f
fierce-park-88503
04/08/2019, 7:27 PMah ok
a
aloof-angle-91616
04/08/2019, 7:27 PMor git maybe too, yelling is no fun
f
fierce-park-88503
04/08/2019, 7:27 PM“yelling” was strong, people weren’t too upset, just mildly grumbling
a
aloof-angle-91616
04/08/2019, 7:28 PMlower on the yelling axis
f
fierce-park-88503
04/08/2019, 7:28 PMI think git does have some level of rename detection that should make this easier, but I don’t think it always works too well, and seems to really have trouble with large moves
fierce-park-88503
04/08/2019, 7:28 PMmoving it piece by piece in a few changes might have helped
a
aloof-angle-91616
04/08/2019, 8:07 PMthere are some options you can configure for change/rename detection, we use them in our pre-commit hook
aloof-angle-91616
04/08/2019, 8:08 PMaloof-angle-91616
04/08/2019, 8:08 PMnot sure if it would help here though
5 Views