[04:22:47] Loops was not so easy to get the code working as expected. [04:23:01] Unexpected errors are cropping up [04:23:17] Will restart work after some time again [04:46:24] https://github.com/infobliss/sibutest2/blob/master/OOP/NationaalArchiefGLAM.py#L14 [04:47:08] File "./OOP/NationaalArchiefGLAM.py", line 14, in from GenericGLAM import GenericGLAM [04:47:23] ImportError: No module named 'GenericGLAM' [04:47:47] In my local machine the import was successful though [05:30:20] I will let you know when I see infobliss around here [05:30:20] @notify infobliss [14:26:24] infobliss: where are you getting that exception? tool labs? [14:39:21] yes [14:39:36] zhuyifei1999_ : yes in toollabs [14:55:31] sorry, was away [14:55:59] can you use my branch? [14:56:05] like make it master [14:59:41] infobliss: I don't understand your tool direct layout. why do you have another copy of the files in ~? [15:00:17] *directory [15:05:38] umm [15:06:47] idk [15:06:55] then delete them [15:07:07] I am not aware of other copies [15:07:36] add-license-2? [15:07:44] ~/www/python/src [15:07:49] right? [15:08:29] you mean in the toollabs [15:08:37] yeah [15:08:55] the files in /www/python/src are operational [15:09:07] yeah, what's those in ~ for? [15:09:26] whereas the ones in $HOME are obtained by scp from local machine [15:09:42] I will check [15:09:47] and delete them [15:10:44] keep only one copy [15:11:09] Ok. In fact I don't know how there are 2 copies. [15:11:28] also can you commit under your name not tools.sibutest? [15:12:05] Ok but I just do normal commits. [15:12:16] it doesn't look professional honestly. and please switch reset master to restore [15:12:29] will find out how to change that to my git username [15:12:34] cherry-picking the additional commits [15:13:12] ok [15:16:20] also, when your local changes are not yet pushed to github, I highly recommend rebase instead of merge [15:16:29] the history is cleaner that way [15:17:20] ok [15:17:56] I mean, you won't end up with commits like https://github.com/infobliss/sibutest2/commit/334c227379a76a3cb6f9326b86667583146facc5 [15:19:22] I think as of now all local changes are in github [15:19:40] k [15:20:23] do you know why I got that ImportError: No module named 'GenericGLAM'? [15:21:04] I still think it's a result of a. you are on master not restore b. there is the second copy [15:21:33] alright [15:22:24] but does it matter where I am pushing in github? [15:22:30] ? [15:22:35] I mean in which branch [15:22:48] just reset master to restore [15:23:18] I mean make master branch to have the same history as restore [15:23:52] ok I will [15:24:05] will be going for dinner and come back [15:24:26] I can geive you the commands if you wish, but I'd prefer if you can find how yourself :P [15:24:58] :) [15:25:00] ok [15:25:06] let me find out [16:33:14] sorry for the delay, my internet was not getting connected. [16:34:56] np [17:10:59] hi [17:11:06] I don't see two copies [17:11:10] ? [17:11:19] cd ~/www [17:11:24] pwd [17:11:36] I got [17:12:10] https://www.irccloud.com/pastebin/68KbOmig/ [17:12:13] /data/project/sibutest/www [17:13:38] see my stat above [17:16:18] how do you know these two are different app.py? [17:16:31] they seem to be in the same location [17:16:56] clearly different inode [17:16:58] ... [17:18:03] ok this /data/project/sibutest/app.py one was at different location [17:18:13] I was referring to that [17:18:29] also a few other files there [17:19:29] yes I removed them now [17:19:40] in fact some were for backup [17:20:14] still NationaalArchief2.py [17:20:28] that was back up [17:20:48] shall I rename it? [17:21:03] backups are in git [17:21:35] ok let me delete [17:23:49] I could not delete the files in in /data/project/sibutest/OOP [17:23:58] Permission denied [17:24:04] Asks sudo password [17:24:40] o.O [17:28:29] infobliss: $ take ~/OOP [17:28:44] ^ is why you aren't supposed to scp [17:29:07] ugly hacks like take are just to make scp actually work [17:29:23] I don't know how to copy other than scp [17:29:25] see https://phabricator.wikimedia.org/T113979 [17:29:28] use git [17:29:44] that's longer [17:29:57] i.e. edit on local, push to github, pull on tool labs [17:30:25] yeah 3 steps :) [17:30:46] fail proof [17:31:02] (y) [17:32:00] deleted /OOP :) [17:32:21] btw what is the ~ in the filepaths? [17:32:29] $HOME [17:32:44] ok [17:50:28] for "reset master to restore" [17:50:47] https://stackoverflow.com/questions/2862590/how-to-replace-master-branch-in-git-entirely-from-another-branch [17:50:55] Is this correct? [17:53:06] It should work. I'm unaware of this methos [17:53:09] *method [17:53:23] I would use git reset [17:54:32] ok [17:54:46] then please tell me how you do it. [17:55:51] git checkout master; git reset --hard origin/restore; git push --force [17:56:39] cool [17:56:58] From should work from my local machine right? [17:57:41] ? [17:58:05] these commands should work from my local machine right? [17:58:22] It should, if you have fetched origin [17:58:41] i.e. loaded github info [17:58:45] after I pushed [17:59:24] and it assumes that you have no unstaged changes [17:59:25] i.e., git pull repo [17:59:53] git pull = git fetch origin; git merge origin/master [18:00:11] ok [18:03:26] also don't forget to cherry pick https://github.com/infobliss/sibutest2/commit/af0b9b5dc98a9f6deca274283562524651f9dd06 and https://github.com/infobliss/sibutest2/commit/3d5921781121341455158c325824b21f27924b8b [18:03:59] other copies of the repo will have to reset themselves because of the force pushing [18:07:29] I will try to do a good job [18:07:45] k