| 07:02.08 | *** join/#stepcode kesha (~kesha@49.249.1.15) |
| 08:14.54 | *** join/#stepcode kesha (~kesha@49.249.1.15) |
| 08:41.48 | *** join/#stepcode kesha (~kesha@49.249.1.15) |
| 09:37.13 | *** join/#stepcode kesha (~kesha@49.249.1.15) |
| 09:52.25 | *** join/#stepcode kesha (~kesha@49.249.1.15) |
| 09:54.58 | *** join/#stepcode kesha__ (~kesha@49.249.1.15) |
| 10:09.15 | *** join/#stepcode kesha__ (~kesha@49.249.191.238) |
| 10:51.07 | *** join/#stepcode kesha__ (~kesha@49.249.9.138) |
| 11:31.35 | *** join/#stepcode mpictor_ (~mpictor_@2600:1015:b115:5b2d:0:41:62b8:7a01) |
| 11:32.02 | mpictor_ | Hi kesha_ |
| 11:32.08 | mpictor_ | how's it going? |
| 14:16.37 | *** join/#stepcode kesha__ (~kesha@49.249.9.138) |
| 14:18.25 | *** join/#stepcode cstirk (~quassel@96.255.19.39) |
| 14:18.42 | *** join/#stepcode kesha (~kesha@49.249.9.138) |
| 14:42.42 | *** join/#stepcode kesha__ (~kesha@49.249.9.138) |
| 17:31.18 | *** join/#stepcode mpictor_ (~mpictor_@2600:1015:b10b:81fb:0:45:24f7:b801) |
| 19:31.15 | *** join/#stepcode kesha (~kesha@49.249.9.138) |
| 19:31.43 | kesha | Hi mpictor_ |
| 19:31.59 | kesha | Good. Finally I cloned stepcode |
| 19:32.30 | kesha | But and moved the .git/ folder from that clone to my direcory |
| 19:32.40 | kesha | s/direcory/directory |
| 19:35.17 | kesha | But, git diff shows many changes which are done after I had cloned initially the present one- like 134842 deletions in data/STEPTools_merged_schema/modified_step_merged_cad_schema.exp , data/Cmakelists.txt etc |
| 19:35.24 | kesha | which I have not done |
| 19:36.03 | kesha | And staging patchwise "git add -p" is improbable because they are many |
| 19:36.16 | kesha | lots and lots of them |
| 19:36.23 | kesha | Any efficient way ? |
| 19:36.58 | kesha | You were telling something abt "git am" , but I dont remember exactly and ibot was also not present at that time |
| 19:38.49 | mpictor_ | Hmm |
| 19:40.22 | kesha | What was the command ? |
| 19:41.07 | mpictor_ | git am and whatever the other command was allow you to export patches from a repo and commit them to another |
| 19:41.37 | mpictor_ | git fornat-patch maybe? |
| 19:41.47 | mpictor_ | *format |
| 19:42.12 | kesha | can u plz look it up once |
| 19:42.31 | mpictor_ | I'm on my phone at the moment; should be at my computer in 30 minutes or so |
| 19:43.10 | kesha | Oh, IRC from phone ? Which app ? |
| 19:43.41 | kesha | or the web interface ? :O |
| 19:44.51 | mpictor_ | Andchat |
| 19:45.33 | mpictor_ | I thought it would drain my battery, but it isn't that bad |
| 19:49.57 | *** join/#stepcode Kimz (~AndChat32@49.249.9.138) |
| 19:50.12 | Kimz | Hi..from andchat ! |
| 19:50.27 | kesha | Cool..I just installed it on my cell .. |
| 19:54.51 | Kimz | (y) for AndChat |
| 19:55.50 | mpictor_ | There's also irssi connectbot, if you can ssh into a computer that has irssi. It's beneficial if the server has a more reliable connection, since it will buffer messages when you are disconnected |
| 19:56.54 | mpictor_ | And I think there's a version for mosh, which is supposedly better than ssh |
| 20:01.16 | kesha | always look around for mobile version of the softwares she use regularly, but searched for IRC ! |
| 20:07.31 | kesha | *never |
| 20:32.40 | *** join/#stepcode mpictor_ (~mpictor_@2600:1015:b11f:68a:0:4c:cc98:8e01) |
| 20:36.43 | *** join/#stepcode mpictor_ (~mpictor_@2600:1015:b11f:68a:0:4c:cc98:8e01) |
| 20:42.15 | *** join/#stepcode mpictor_ (~mpictor_@2600:1015:b11f:68a:0:4c:cc98:8e01) |
| 20:45.25 | *** join/#stepcode Kimz (~AndChat32@49.249.9.138) |
| 20:48.34 | *** join/#stepcode mpictor (~mpictor_@2601:d:b280:9:7c7b:dd80:988b:1fbb) |
| 21:37.48 | *** join/#stepcode mpictor_ (~mpictor_@2601:d:b280:9:7c7b:dd80:988b:1fbb) |
| 21:38.38 | *** join/#stepcode mpictor_ (~mpictor_@2601:d:b280:9:7c7b:dd80:988b:1fbb) |
| 21:39.56 | mpictor_ | kesha: I think I figured out what happened - you started work on master without updating to the version on github |
| 21:40.21 | mpictor_ | That would explain the differences |
| 21:42.17 | kesha | yes, I started on master branch first. |
| 21:43.17 | mpictor_ | OK. One sec while I look up some commands... |
| 21:43.17 | kesha | But now what shall I do ? |
| 21:55.59 | mpictor_ | I thought there was a command that would do this in 1-2 steps, but I don't see it in the man pages |
| 21:56.21 | mpictor_ | Create an empty directory and move .git into it |
| 21:56.56 | mpictor_ | Run 'git reset --hard v0.7' from the new dir |
| 21:57.22 | mpictor_ | Then move .git back into the dir it was in |
| 21:57.58 | mpictor_ | Run 'git status', and the only changes should be ones you made |
| 21:58.52 | mpictor_ | That is assuming you started this branch at the same point as your duplicate files branch |
| 21:59.23 | mpictor_ | (which started on the v0.7 tag) |
| 22:00.15 | mpictor_ | If it looks good, create a branch and create your commits |
| 22:02.27 | mpictor_ | And next time you start a new branch, don't use 'git init' - use 'git checkout master', 'git pull origin', and 'git checkout -b ks/newbranchname' |
| 22:02.36 | mpictor_ | :) |
| 22:07.27 | kesha | fatal: ambiguous argument 'v0.7': unknown revision or path not in the working tree. |
| 22:07.27 | kesha | Use '--' to separate paths from revisions |
| 22:09.32 | mpictor_ | OK, try c269cd82 instead of v0.7 |
| 22:10.47 | kesha | same thing again |
| 22:11.51 | mpictor_ | What is the first line git prints for 'git log -n1'? |
| 22:12.36 | kesha | The last commit - 854202287 |
| 22:13.40 | mpictor_ | Oh! |
| 22:13.53 | mpictor_ | Checkout the master branch |
| 22:14.05 | mpictor_ | Then try |
| 22:15.14 | mpictor_ | git checkout master |
| 22:15.23 | kesha | master is some inbetween commit |
| 22:15.33 | kesha | s/is/is at |
| 22:15.53 | mpictor_ | Try 'git reset --hard HEAD' |
| 22:16.08 | mpictor_ | then checkout master again |
| 22:17.43 | kesha | commit 034ab556b309939634be2546fb0a4c5bc2830155 |
| 22:20.58 | mpictor_ | 'git status' shows you are on the master branch? |
| 22:21.25 | kesha | yes |
| 22:22.07 | mpictor_ | OK, try the checkout command from earlier |
| 22:22.43 | mpictor_ | c269cd82 |
| 22:23.14 | kesha | error: pathspec 'c269cd82' did not match any file(s) known to git. |
| 22:23.37 | mpictor_ | Great |
| 22:23.56 | mpictor_ | I'm not sure what is going on :/ |
| 22:24.36 | kesha | I think c269.. is not there in its history and we are trying to go back to that ! How will it work ? |
| 22:25.05 | mpictor_ | Are you sure you're in a repo that has been cloned from GitHub, or in the one where you did 'git init'? |
| 22:25.21 | mpictor_ | *freshly cloned |
| 22:25.49 | kesha | new directory |
| 22:27.18 | mpictor_ | Yeah, but is the .git dir the same one where the history was erased with 'git init'? |
| 22:28.17 | kesha | I think so, I am confused ! :X |
| 22:28.26 | kesha | Wait. Give me 5 mins |
| 22:28.30 | mpictor_ | Sure |
| 22:29.11 | *** join/#stepcode mpictor_ (~mpictor_@2601:d:b280:9:7c7b:dd80:988b:1fbb) |
| 22:30.21 | mpictor_ | Hmm. How many branches does 'git branch -a' list? There should be many if the history is intact |
| 22:32.02 | mpictor_ | Also, I could email you an archive of the repo if it would be faster than you cloning it. I'm not sure how well git compresses while cloning |
| 22:37.02 | kesha | Done :)))) Finally.. :)) Hope so it works well.. Check on github the branch ks/cppcheck . Fingers crossed ! |
| 22:44.29 | mpictor_ | Great! |
| 22:44.45 | mpictor_ | The history is still there |
| 22:45.11 | mpictor_ | Now I guess you're going to split that one commit into many? |
| 22:45.41 | kesha | Check once the build...and tests .. |
| 22:45.51 | mpictor_ | Oh ok |
| 22:46.56 | kesha | I did on my lappy.. it works well , but to be more sure, you run it once . |
| 22:47.24 | mpictor_ | By the way, if you get email from travis-ci complaining that the branch won't build, ignore it. That won't work correctly yet |
| 22:47.55 | mpictor_ | I'll try it, but it will be a while before I can |
| 22:48.15 | kesha | I got a mail ! ;) |
| 22:48.50 | kesha | and thought it to be my mistake ! |
| 22:49.02 | mpictor_ | Actually, as long as the same tests fail as before, you're good to go |
| 22:50.00 | mpictor_ | I didn't realize travis-ci was active until I pushed a branch and got that message. I signed up but didn't think it was active yet |
| 22:50.49 | mpictor_ | Once new branches are based on the current master, it will work |
| 22:51.11 | mpictor_ | There's a file in master that tells it how to build and test |
| 22:52.49 | kesha | Okay.. |
| 22:53.17 | kesha | Now it will split up that into many commits. |