----BEGIN CLASS---- [13:28] #startclass [13:28] Razy Kased [13:28] Roll Call [13:28] kumar vipin yadav [13:28] Saikat Dey [13:28] sayan: lol [13:28] Deepak Chethan [13:28] Ashwani Kumar Gupta [13:28] hemanth [13:28] akash pathak [13:28] Razy Kased [13:28] Abhinav Shirur [13:28] Shashank Kumar [13:28] Robin Schubert [13:28] Abdul Wahab Abrar [13:28] Shivam Singhal [13:28] Suraj Ghimire [13:28] <_Richard_> Mayank gupta [13:28] Messi Fc [13:28] Aryan Tripathi [13:28] Gaurav Sitlani [13:28] Bhavin Gandhi [13:28] Chiranjeev Gupta [13:28] Anusha Srinivasan [13:28] Farhaan Bukhsh [13:28] Priyanka Sharma [13:28] Soumam Banerjee [13:28] Ranjeet Kumar [13:28] Anu kumari Gupta [13:28] Amit Kokitkar [13:28] Anupama Shipurkar [13:28] Mayur khomane [13:28] Mohsin Mumtaz [13:28] Syed Mohammad Fiha [13:28] Vipul Gupta [13:28] Gunjan [13:28] Deepika Upadhyay [13:28] Jason Braganza [13:28] Himanshu Awasthi [13:28] Abhishek Singh [13:28] Akshay Gaikwad [13:29] Santosh Kumar Shaw [13:29] pavan yejare [13:29] Jitesh Pabla [13:29] Mohd Omama [13:29] Balaji [13:30] *Back to the story mode* [13:30] Ravindra Lakal [13:30] *- *Chapter 3: Understanding VCS: Branches* [13:30] *- Few months more have passed. Tux visits a local workshop & presents one of his image. [13:30] :) [13:30] *- Two clients love his image but one wants to add a Sepia tone to it and another want Black & White (B&W) [13:30] *- Tux now needs to change the work flow again, because over time Tux would be getting more and more clients. [13:30] *- Tux like Newton sat under a tree waiting for a apple to fall, but instead notices the branches of the trees which gave Tux an idea. A revolutionary one! [13:31] Roll Call: Nikita Kotak [13:31] *- So Tux comes back home and starts working on the image. But now Tux creates two copies of images & names the directory as sepia & bw. [13:31] *- Tux who just happened to know linking, linked working directory to the sepia directory [13:31] *- So in the morning, Tux opens the working directory (which is pointing to sepia directory) opens the sepia directory [13:32] *- In the evening, Tux changes the link to bw, so Tux can work on bw image over the rest of the time. [13:33] https://paste.fedoraproject.org/paste/vvEi9Satwai2FOprwAh0YQ [13:33] *- Next time, Tux get a new client, Tux just needs to create new branch directory & start working. [13:33] https://paste.fedoraproject.org/paste/oEE2reA7EqH5eB7KpcDh-Q [13:33] Roll Call: Ganesh Nomula [13:33] Roll Call:Kishore Saldanha [13:34] yurii pylypchuk [13:34] - git branch # Tell which branch you are one (the one with *) [13:34] Roll call:Kshithij Iyer [13:34] master branch [13:34] ^^ okay type this into the foobar directory [13:35] * master [13:35] * master [13:35] master [13:35] *master [13:35] ! [13:35] next [13:35] *master [13:36] master [13:36] master [13:36] i did git branch and nothing came up, says not a git repo. did git init and git branch and still nothing? [13:36] Roll call Kshitij [13:36] Roll Call: Avik Mukherjee [13:36] Okay , that turn was from last day ,got answered [13:36] Roll Call: Nishanta Sarma [13:36] [13:36] saikat_, read the instructions carefully [13:37] saikat_: are you doing that in the foobar directory? [13:37] Roll Call: Sakshi Saraswat [13:37] next [13:37] hmm, strange batul did not get reset [13:37] Yeah ,true sayan [13:37] yups sayan this did happen yesterday too [13:37] sayan, bhavin192 , thanks, my bad, was not in the directory [13:38] Also, people when I tell you tell the output, just 2-3 people reply [13:38] Roll call: Shankar Jha [13:38] It's no meaning that all say the same output [13:38] ! [13:38] Rest of people can tally the output, if it does not match, then raise your hand [13:38] next [13:38] I tried this with a repo I just created which does not have any commit. Why does it not output anything? [13:38] ! [13:39] ashwanig: you need to have one commit atleast [13:40] next [13:40] sayan, Why so? [13:40] How to revert back to a snapshot? I was wondering about that for the entire day . [13:40] ahole, search [13:40] sayan, As saikat_ said when he was in root directory he did git init right. So does it make his entire root a git directory? [13:41] ! [13:41] ashwanig: I forgot the exact reason, vivek_ do you remember? I remember discussing it with you [13:41] ahole: git revert [13:42] \me requests someone to pm what has been going on today, please! [13:42] im_mohsin: yes [13:42] next [13:42] sayan, can we ammend commits other than the last commit ? [13:42] 0 [13:42] ! [13:42] ! [13:42] sorry mistake :( [13:42] Padfoot7: I remember someone asking the question last day but nobody pinged after the class [13:42] Roll call: Akshay Iyer [13:42] next [13:43] Padfoot7: This is out of the scope [13:43] next [13:43] can saikat_ undo what he did? [13:43] okay [13:43] ! [13:43] Roll call: Vamsi Krishna. [13:43] soumam007: yes, delete the .git directory [13:43] next [13:43] sayan, im_mohsin , wait what, if i did a git init and made my root a git directory, how do i revert it? [13:43] ok [13:43] I told the answer just now [13:44] Moving ahead [13:44] If I shut down the system without commiting the changes Is the staging area will remain same when I restart? [13:44] got it, yes. sayan [13:44] balaji: yes, it will be there because those are saved in a file [13:44] balaji: the concept of "save" still remains same [13:45] Okay. got it. Thanks [13:45] and all the stuffs you do in git are saved [13:45] - git checkout -b sepia # Create a new branch -b=tells to create new branch [13:45] - vim hellomars.txt # Add the text "Snapshot 4" [13:45] ! [13:45] - git add -u [13:45] - git commit -m "Snapshot 4" [13:46] - git branch # Tell which branch you are in? [13:46] next [13:47] *sepia [13:47] Right [13:47] git branches are just reference or lightweight movable pointer to a commit , so if there are no commit in repositary then are no branches [13:48] *sepia [13:48] there* [13:48] Suppose I make a wrongful change in my source code and I have to revert back to the previous commit. How should I do it? [13:48] avik, I had sent you today's log from the class start. [13:48] eof [13:49] ! [13:49] darkJedi: there are a bunch of ways to do it, git-revert, git-reset. but that's something I won't discuss in this class [13:49] next [13:49] ! [13:50] is branching created for versions [13:50] next [13:50] ! [13:50] hemanth: versions as in? [13:50] ghishadow, Thanks :) [13:50] sayan, like version 1.1 and version 1.2 of same software [13:51] hemanth: no [13:51] after git add -u , i did git status, I get nothing added to commit [13:51] cran-cg: fpaste the output [13:52] hemanth: versions are very much on code level and not git but there are commands to manage the version well [13:52] sayan: sorry I have to leave urgently. [13:52] branches are to carry out parrallel development on the same working directory [13:52] ! [13:53] thanks sayan [13:53] Cran_cg : after git add -u ,you have to git commit -m "snapshot4" [13:53] sayan: https://pastebin.com/n8CvmWEG [13:53] like in Fedora, we maintain two branch master & develop. The development happens on develop and when we have to release we merge develop into master [13:54] and master is latest version and is deployed [13:54] cran-cg, you have not added the hellomars.txt to tracked files, we have done it in last session [13:54] cran-cg: you did not properly follow in last class [13:54] cran-cg: what do you thing you should do?? [13:55] sayan: I made a new txt file. [13:55] Silly mistake [13:55] Understood [13:55] sayan, merging develop into master means replacing the old files in master with their new versions in develop right? [13:55] cran-cg, share your mistake [13:55] Sorry I asked out of turn [13:56] ! [13:56] ashwanig: the proper word would be updating [13:56] next [13:56] next [13:56] next [13:56] Now currently we are on the sepia branch, how do we jump back to the master branch? [13:56] if Tux wanted to create subbranch and navigste how would he do that ? [13:57] deepika: there is nothing as sub-branch [13:57] s / navigate [13:57] and I don't understand what do you mean with subbranch [13:57] ahole, git checkout master [13:57] ahole: wait! [13:57] Gaurav: I can see the messages. [13:57] creating new branch like for b&w [13:58] soumam007: Umm. I was mistakenly made a new repo :( [13:58] Sorry for the confusion [13:58] :( [13:58] - git log [13:58] sayan and then change the branch from [13:58] what is happening? [13:58] b&w to sepia [13:58] what is this going on? [13:59] People calm down [13:59] why are people getting disconnected? [13:59] There is nothing to worry, [13:59] championshuttler, Matrix server is having problem [13:59] - git log [13:59] ashwanig, ok :) [13:59] Check the commits you have [13:59] You will be having the Snapshot 4 commit [13:59] - git checkout master # Simply move around branches [13:59] - vim helloworld.txt # Add the text "Snapshot 5" [14:00] - git add -u [14:00] - git commit -m "Snapshot 5" [14:00] - git log # Notice anything? [14:01] There is no changes in git still says snapshot 3. [14:01] sayan, snapshot 5 after checking out to master? [14:01] it shows commits from the current branch? [14:01] sayan, Yes, Snapshot 5 commit got added [14:02] yes a new commit add to the list [14:02] sayan - not branch commits visible [14:02] You will find that the Snapshot 4 is not there [14:02] That is because Snapshot 4 commit is in sepia branch [14:02] sayan, Snapshot 4 is not there [14:02] not in master [14:03] next [14:03] Moving ahead [14:03] - git checkout sepia [14:03] - vim hellomars.txt # Add the text "Snapshot 6" [14:03] - git add -u [14:03] - git commit -m "Snapshot 6" [14:03] - git log # Again, noticed anything? [14:04] ! [14:04] new commit, "Snapshot 6" [14:04] next [14:04] ! [14:04] next [14:04] sayan - Sanpshot 5 missing [14:05] jasonbraganza: yup, Snapshot 5 is missing [14:05] sayan, i cannot write anything in terminal after the git log. the cursor blinks on a word saying END [14:05] Yes [14:05] and Snapshot 6 is on top of Snapshot 4 [14:05] saikat_, do :q [14:05] saikat_: press q [14:06] - git checkout -b bw # What we are doing here? [14:06] sayan: Is it If we’re in sepia branch and try git log, then it shows all the master and branch commits? [14:06] creating a new branch bw [14:06] sayan,im_moshin, thanks, worked, but this did not happen the first time i did dit log [14:06] new branch , sayan [14:06] creating a bw branch [14:07] got the new branch bw :) [14:07] saikat_, happens everytime :) [14:07] creating new branch [14:07] ganeshnomula_: yes, because sepia is created of master [14:07] creating bw branch [14:07] creating a new branch and switching to that branch [14:07] so if you have a-b-c in master [14:07] and then you create a new branch out of master branch [14:07] you will have all the a-b-c commits [14:07] [14:08] See, I told earlier that it's good that 2-3 people give the reply [14:08] But *nobody* listens [14:08] Moving ahead [14:08] - vim hellomars.txt # Add the text "Snapshot 7" [14:08] - git add -u [14:08] - git commit -m "Snapshot 7" [14:09] - git log # What do you notice? [14:09] ! [14:09] next [14:10] sayan: should I’ve to type in git checkout -b bw? [14:10] getting a bit confused [14:10] snapshot 6,7 [14:10] snapshot 7 on the top [14:10] Snapshot 7 after Snapshot 6 with the log of master branch. [14:10] ganeshnomula_, yes [14:10] no snapshots from sepia in here [14:11] sayan: History of last 4 commits including the ones done on sepia branch [14:11] switchwd to new branch [14:11] sayan: The snapshots of sepia branches are present in this branch [14:11] ganeshnomula_: yes [14:12] ! [14:13] jasonbraganza: can you fpaste the output of git log --graph [14:13] ! [14:13] sorry i goofed [14:13] lol [14:14] ! [14:14] anybody else fpaste output of git log --graph [14:15] ! [14:15] next [14:15] why aren't we finding Snapshot 5? [14:15] ! [14:15] ! [14:15] https://pastebin.com/DMXF6jvs [14:15] ! [14:15] I'm a little lost there [14:16] ! [14:16] cran-cg: cool tahnks [14:16] avik: there's no snapshot 5 :) [14:16] avik_: in which branch did you do that Snapshot 5? [14:17] haven't we done it? [14:17] sayan, see mine once, https://paste.fedoraproject.org/paste/hiF89k41HhnPhYVxDYiV3w [14:18] avik: I am really not getting you [14:18] okay, I thought since we are moving sequentially, I thought we may have done it also! anyway, its okay! [14:18] https://pastebin.com/zmpkuuZV [14:18] avik: are you reading properly? I don't think you are [14:18] next [14:18] :( [14:19] My query answered. Thanks :) [14:19] No more need to paste the code and send the url here [14:19] next [14:19] sayan, Had we created a branch from master we would nit have got commits from sepia right? [14:19] ! [14:19] im_mohsin: yes, right [14:19] next [14:19] I cannot find the two text files when i open foobar and in master branch! why? but can see both when in sepia? [14:19] <_anshul> now I get it [14:19] thanks, this way my doubts gets cleared :) [14:20] * okay the next steps that I tell are only for soumam007 * [14:20] soumam007: can you do this? [14:20] ok [14:20] - git checkout master [14:20] - git status [14:21] ^^ fpaste the output of this command [14:21] -- ls [14:21] ok wait a sec [14:21] ^^ fpaste the output of ls also [14:21] <_anshul> only has the initial commits we made on master [14:22] _anshul: Let soumam007 and sayan speak [14:22] for status its nothing to commit [14:23] ls [14:23] ! [14:23] only helloworld.txt [14:24] sorry i havent worked with fpaste till now [14:25] soumam007: go to paste.fedoraproject.org and paste the output of the command [14:25] and paste the link here [14:25] I want all of you look and try to look what's wrong with soumam007's repo [14:26] Rest of you here is how the tree looks: [14:26] https://paste.fedoraproject.org/paste/sjKIB8WYg78Mhpe2jbb5EQ [14:27] Yes sayan. [14:27] sayan what i am copying from terminal isnt pasting in fedora paste [14:27] sorry for such silly questions now [14:28] sorry, I have to leave early. Thanks for the session, sayan [14:28] soumam007: did you open https://paste.fedoraproject.org/ ? [14:28] soumam007, Are you using Ctrl+Shift+C to copy from terminal? [14:28] yes [14:28] sayan ashwanig [14:28] soumam007: and paste in paste.fedoraproject.org with Shift + v? [14:29] lol [14:29] :P [14:29] Ctrl + v [14:29] yeah did the same [14:29] soumam007: what's happening? you are not able to paste? [14:30] The text is not coming in the pastebin? [14:30] soumam007: if you are not able to do that leave [14:30] ok, i got it [14:30] we will figure out later [14:30] i think [14:30] do we have any command to check the tree structure in terminal? [14:30] <_anshul> git log --graph [14:31] terminal is in vm [14:31] :( i am dumb [14:31] thanks _anshul [14:31] im_mohsin: git log --graph --all [14:31] soumam007: I am moving ahead. come back to bw branch [14:31] ok [14:32] next [14:32] next [14:32] next [14:32] Got my query answered. Thanks [14:32] next [14:32] why i am seeing commits of sepia in bw ? [14:32] whenever we create a new branch is that is created from the master branch or the current branch we are in? [14:32] balaji - branch you’re in [14:33] imranjeetsingh_: because when you created a new branch bw, you were in sepia [14:33] imranjeetsingh_: so you checked out a new branch bw out of sepia [14:33] imranjeetsingh, because you were in sepia when you created bw and all commits in sepia were copied in bw :) [14:33] jasonbraganza, Thanks [14:33] ok thanks [14:33] imranjeetsingh_: so when you checkout a new branch you will have all the commits from the branch you are checking out [14:33] next [14:34] my output is not matching with ahole. Will you see once at https://paste.fedoraproject.org/paste/hiF89k41HhnPhYVxDYiV3w ? i am getting snapshots 7,6,3,2 repeated 3 times. ahole got snapshots 7,6,5,3,2,1 repeated twice. where is it going wrong? here is ahole's: https://pastebin.com/zmpkuuZV. [14:34] next [14:34] My question is answered thanks :) [14:34] can we import changes to "one particular file" from another branch ? [14:35] Padfoot7, yes you can do something like merge but thats a topic for other day i guess [14:35] Padfoot7: the question sounds ambiguous [14:35] saikat_: ahole did messup [14:35] :) [14:36] ! [14:36] imranjeetsingh_: check this tree link posted by sayan and perform git -log from different branches, you’ll understand what you’re getting. https://paste.fedoraproject.org/paste/sjKIB8WYg78Mhpe2jbb5EQ [14:36] The commit tree should be like this [14:36] hahaha.. yeah.. saikat_ check sayan commits [14:36] https://paste.fedoraproject.org/paste/sjKIB8WYg78Mhpe2jbb5EQ [14:36] sayan, ohh, is mine correct? i am getting the idea of branches, but still struggling with the implementation. [14:36] thanls ganeshnomula_ [14:37] Just travese from the end I have written branch name in brackets and move back [14:37]