| *** Quits: JonMarkGo (~Jon@ool-18bfe16f.dyn.optonline.net) (Ping timeout: 240 seconds) | 00:35 | |
| *** Joins: kirillka (~Miranda@195.242.142.17) | 01:39 | |
| *** Quits: phrenic (~phr3n1c@feldstudie.net) (Ping timeout: 240 seconds) | 01:54 | |
| *** Joins: Cupertino (~Cupez@unaffiliated/cupertino) | 02:29 | |
| *** Joins: Rixie (~Rixie@0x4dd7390e.adsl.cybercity.dk) | 03:05 | |
| *** Joins: Phileas1 (~chatzilla@vpn.rzz.ch) | 03:27 | |
| *** Quits: kirillka (~Miranda@195.242.142.17) (Quit: kirillka) | 04:57 | |
| *** Joins: rolfkleef (~rolfkleef@92.254.21.180) | 05:04 | |
| *** Joins: Cupez (~Cupez@unaffiliated/cupertino) | 05:15 | |
| *** Joins: mantisbt_50550 (7040ab82@gateway/web/freenode/ip.112.64.171.130) | 05:30 | |
| mantisbt_50550 | hello? | 05:31 |
|---|---|---|
| dhx1 | your mic is on | 05:37 |
| *** Joins: kirillka (~Miranda@195.242.142.17) | 06:58 | |
| *** Quits: mantisbt_50550 (7040ab82@gateway/web/freenode/ip.112.64.171.130) (Ping timeout: 272 seconds) | 07:20 | |
| *** Quits: Phileas1 (~chatzilla@vpn.rzz.ch) (Read error: Connection reset by peer) | 08:10 | |
| *** Joins: Phileas1 (~chatzilla@vpn.rzz.ch) | 08:10 | |
| *** Quits: foobot (~supybot@leetcode.net) (Remote host closed the connection) | 08:39 | |
| *** Joins: foobot (~supybot@leetcode.net) | 08:39 | |
| *** Joins: daryn (~daryn@h158.249.190.173.static.ip.windstream.net) | 08:51 | |
| jreese | dhx1: paul has been looking for you desperately the past couple weeks | 09:03 |
| *** Quits: daryn (~daryn@h158.249.190.173.static.ip.windstream.net) (Quit: Ex-Chat) | 09:07 | |
| *** Joins: daryn (~daryn@h158.249.190.173.static.ip.windstream.net) | 09:09 | |
| *** Quits: jimmy___ (42d8a452@gateway/web/freenode/ip.66.216.164.82) (Quit: Page closed) | 09:30 | |
| *** Quits: Rixie (~Rixie@0x4dd7390e.adsl.cybercity.dk) (Quit: Rixie) | 09:38 | |
| *** Joins: jimmy__ (42d8a452@gateway/web/freenode/ip.66.216.164.82) | 09:41 | |
| jimmy__ | jreese: so I made a branch of 1.1.8 and applied my changes to it, commited them, then rebased the rest of the commits up to master-1.1.x on top of my new commit. was that the right procedure? | 09:55 |
| jreese | you did it backwards | 09:55 |
| jimmy__ | jreese: :-( | 09:56 |
| jreese | you'd want to rebase your new commit on top of the master-1.1.x commits | 09:56 |
| jimmy__ | jreese: ok I'll try that | 09:56 |
| *** Quits: kirillka (~Miranda@195.242.142.17) (Quit: kirillka) | 10:01 | |
| jimmy__ | jreese: interesting, so the last commit in the tree should be mine then | 10:04 |
| jreese | yep | 10:05 |
| jimmy__ | jreese: now that I did it backwards, do I need to start all over? Or read the rebase docs. | 10:08 |
| jreese | it might be simpler to just start over | 10:10 |
| jimmy__ | jreese: so once I've done all this properly, I will have a branch in my git which contains master-1.1.x and my changes. what git concept do I use to give someone else those changes? | 10:12 |
| jreese | http://docs.mantisbt.org/master/en/developers/ | 10:13 |
| jreese | the first chapter covers those topics | 10:13 |
| jimmy__ | jreese: tyvm | 10:13 |
| jimmy__ | jreese: so i did the rebase the other way after committing changes to my branch of 1.1.8, and now it seems that my branch has become simply equivalent to master-1.1.x, and there is no record of my commit in the log. I'm at my wits end here. | 10:50 |
| jimmy__ | jreese: i'll take this to #git, thanks for your help | 10:53 |
| *** Quits: Cupertino (~Cupez@unaffiliated/cupertino) (Quit: I give up...) | 10:55 | |
| daryn | jimmy___: what branches are you working from? | 10:57 |
| *** Quits: siebrand (~chatzilla@535392CA.cm-6-4c.dynamic.ziggo.nl) (Ping timeout: 250 seconds) | 11:21 | |
| jimmy__ | I made a branch of tag 1.1.8 | 11:30 |
| jimmy__ | daryn: release-1.1.8 sorry | 11:30 |
| daryn | k | 11:30 |
| daryn | so...you made changes on a new branch called release-1.1.8 | 11:31 |
| daryn | which is branched from master -1.1.x at the 1.1.8 tag? | 11:31 |
| jimmy__ | daryn: sorry, I made a branch of release-1.1.8, called branch_release-1.1.8 | 11:32 |
| daryn | ok... | 11:32 |
| daryn | then your changes? | 11:32 |
| jimmy__ | onto that branch | 11:32 |
| daryn | then what? | 11:32 |
| jimmy__ | well, I tried a rebase | 11:33 |
| daryn | what command did you use | 11:33 |
| jimmy__ | I rebased master 1.1.x (which is upstream of master-1.1.x) | 11:33 |
| jimmy__ | I used tortoisegit rebase gui | 11:33 |
| daryn | ah...crud | 11:33 |
| jimmy__ | I can go in and do a command line thing | 11:34 |
| daryn | k. so first of all, what do you need to accomplish | 11:34 |
| daryn | you want your changes on 1.1.8 and then on 1.1.x as well? | 11:35 |
| jimmy__ | yes | 11:36 |
| jimmy__ | i figured since I made my changes to 1.1.8 originally | 11:36 |
| jimmy__ | i would then later need to apply the rest of the changes that were made to master-1.1.x | 11:37 |
| jimmy__ | or would like to, especially since they contain security updates | 11:37 |
| daryn | i would commit my changes on the 1.1.8 branch you created then checkout a new branch from there | 11:37 |
| jimmy__ | well, I havet to check out a new branch of 1.1.8 in the first place | 11:38 |
| daryn | k. so do that. make your changes and commit | 11:38 |
| jimmy__ | did that | 11:38 |
| daryn | ok. if you run git checkout -b newbranch | 11:38 |
| jimmy__ | well let me say, that I did that and now did other things, so my commit is gone and I might have to start all over AGAIN, but | 11:38 |
| daryn | it will create the new branch from that point | 11:38 |
| jimmy__ | aren't I already on a new branch? | 11:39 |
| daryn | you want two branches | 11:39 |
| daryn | and with git it works in the same directory | 11:39 |
| jimmy__ | you'll have to explain it or keep going | 11:39 |
| daryn | so, you create your initial new branch 1.1.8 | 11:39 |
| daryn | make the changes and commit | 11:40 |
| jimmy__ | k | 11:40 |
| daryn | then create a new branch 1.1.x | 11:40 |
| jimmy__ | ok | 11:41 |
| daryn | if your working directory is the 1.1.8 branch with your commited changes, the new branch will be exactly the same as the 1.1.8 branch | 11:41 |
| daryn | until you make your changes | 11:41 |
| daryn | bah | 11:41 |
| daryn | until you rebase | 11:41 |
| jimmy__ | i already made my changes | 11:41 |
| jimmy__ | you mean | 11:41 |
| daryn | right..your changes carry over | 11:41 |
| jimmy__ | I get a branch of 1.1.8, change it, make a new branch of 1.1.x | 11:42 |
| jimmy__ | so now i'm sitting in a wc with.... | 11:42 |
| jimmy__ | god only knows | 11:42 |
| daryn | hehe | 11:42 |
| daryn | it's difficult to explain... | 11:42 |
| daryn | the working directory is the same whatever branch you're working on | 11:43 |
| daryn | git checks out the branch you want into the same directory | 11:43 |
| daryn | so when you checkout a new branch it just puts the branch you were working on away and puts the new one in its place | 11:43 |
| daryn | so... | 11:43 |
| jimmy__ | so i'm only looking at one at a time | 11:43 |
| daryn | yes | 11:44 |
| jimmy__ | makes more sense | 11:44 |
| daryn | so now... | 11:44 |
| daryn | if you just create a branch it does not change your working directory...not sure how tortoise does this... | 11:44 |
| jimmy__ | well | 11:44 |
| jimmy__ | ok i've already made a branch and changed it | 11:44 |
| jimmy__ | if i get a new branch | 11:44 |
| jimmy__ | you expect nothing to change | 11:44 |
| daryn | but if you create a branch by checking out...then it puts the old away and 'checks out' a new branch which is identical to the branch you were working on | 11:44 |
| daryn | well...yse | 11:45 |
| daryn | yes | 11:45 |
| jimmy__ | ok | 11:45 |
| jimmy__ | alright | 11:45 |
| jimmy__ | i'm starting over and i'll use the command line | 11:46 |
| daryn | so now any changes you make will not affect the original 1.1.8 branch where your commits are | 11:46 |
| jimmy__ | so i'm sitting with a branch of master-1.1.x and the branch of my changes is somewhere else hanging out not in my wc | 11:46 |
| jimmy__ | er working dir | 11:46 |
| daryn | right | 11:46 |
| jimmy__ | so now you're going to tell me to merge the branches | 11:47 |
| daryn | no..rebase which is a sort of merge i guess | 11:47 |
| daryn | if your on your 1.1.x branch (whatever you've named it) it is not really 1.1.x yet. it's just a copy of 1.1.8 with your changes | 11:47 |
| jimmy__ | rebase what where, and why do I need to check out another branch of master? | 11:47 |
| jimmy__ | k | 11:48 |
| daryn | nope master is already there | 11:48 |
| daryn | so while you have 1.1.x checked out (your branch, not the original) | 11:48 |
| jimmy__ | ok so i have a branch called whatever 1.1.x, which at this point is the same as my branch of 1.1.8 plus changes | 11:48 |
| daryn | yes. now run `git rebase master-1.1.x` | 11:48 |
| daryn | you might have to use `git rebase origin/master-1.1.x` if you don't have a local copy of the branch | 11:49 |
| jimmy__ | and this will get me what | 11:49 |
| daryn | this command should stash your changes. fast forward the branch to the HEAD of master-1.1.x. Then reapply your changes one commit at a time | 11:50 |
| daryn | if it conflicts it will tell you and give you a chance to fix the conflict and continue rebasing | 11:50 |
| jimmy__ | ok i'll try it out in a moment | 11:57 |
| *** Joins: siebrand (~chatzilla@535392CA.cm-6-4c.dynamic.ziggo.nl) | 12:00 | |
| jimmy__ | so check out release-1.1.8 and create new branch, branch_release 1.1.8 | 12:05 |
| jimmy__ | commit my changes | 12:05 |
| *** Quits: Phileas1 (~chatzilla@vpn.rzz.ch) (Quit: ChatZilla 0.9.86 [Firefox 3.6.14/20110218125750]) | 12:06 | |
| jimmy__ | daryn: check out master-1.1.x in a new branch? or in the branch i've already made? | 12:07 |
| daryn | new | 12:07 |
| daryn | you can create and checkout in one shot | 12:08 |
| daryn | git checkout -b newbranch | 12:08 |
| jimmy__ | ok thats done | 12:08 |
| daryn | or `git checkout -b newbranch oldbranch` to base the new branch on something other than the current active branch | 12:09 |
| daryn | k. so what does `git branch` show? | 12:09 |
| jimmy__ | branch_release-1.1.8 ,,, master ,,, master-1.1.x <- currently here | 12:10 |
| daryn | hm... | 12:10 |
| jimmy__ | so, I have 3 branches | 12:10 |
| daryn | did you name the new branch master-1.1.x? | 12:11 |
| jimmy__ | yes | 12:11 |
| daryn | ah...i wouldn't do that but it's easily fixed | 12:11 |
| jimmy__ | branch_release-1.1.8 was that initial checkout of tag release-1.1.8 into a new branch on which i've applied my changes | 12:11 |
| daryn | you can have a local master-1.1.x but it needs to remain identical to origin/master-1.1.x | 12:11 |
| daryn | except when you are preparing to push to origin | 12:11 |
| jimmy__ | I don't understand anything you just said. do I need to rename my 2nd branch? | 12:12 |
| daryn | not yet | 12:12 |
| jimmy__ | i mean, (the 2nd branch I made)? | 12:12 |
| daryn | just a sec...let's pm and stop spamming everybody else | 12:12 |
| *** Quits: rolfkleef (~rolfkleef@92.254.21.180) (Ping timeout: 260 seconds) | 12:18 | |
| *** Joins: moto-moi (~hylke@2001:888:13e4:1010:21f:e2ff:fe0c:ce28) | 12:22 | |
| *** Quits: Zeeshan_M (developer@f.je) (Ping timeout: 260 seconds) | 12:25 | |
| *** Quits: Cupez (~Cupez@unaffiliated/cupertino) (Ping timeout: 240 seconds) | 13:16 | |
| *** Joins: leethax (~Cupez@541DAC85.cm-5-6c.dynamic.ziggo.nl) | 13:16 | |
| *** Quits: moto-moi (~hylke@2001:888:13e4:1010:21f:e2ff:fe0c:ce28) (Ping timeout: 260 seconds) | 13:23 | |
| *** Joins: moto-moi (~hylke@2001:888:13e4:1010:21f:e2ff:fe0c:ce28) | 13:24 | |
| *** Joins: siebrand_ (~chatzilla@535392CA.cm-6-4c.dynamic.ziggo.nl) | 13:27 | |
| *** Quits: siebrand (~chatzilla@535392CA.cm-6-4c.dynamic.ziggo.nl) (Ping timeout: 252 seconds) | 13:28 | |
| *** siebrand_ is now known as siebrand | 13:28 | |
| *** Quits: moto-moi (~hylke@2001:888:13e4:1010:21f:e2ff:fe0c:ce28) (Ping timeout: 260 seconds) | 13:32 | |
| *** Quits: chilts (~chilts@184-106-200-232.static.cloud-ips.com) (Ping timeout: 260 seconds) | 13:33 | |
| *** Joins: moto-moi (~hylke@2001:888:13e4:1010:21f:e2ff:fe0c:ce28) | 13:33 | |
| *** Joins: chilts (~chilts@184-106-200-232.static.cloud-ips.com) | 13:34 | |
| *** Quits: moto-moi (~hylke@2001:888:13e4:1010:21f:e2ff:fe0c:ce28) (Ping timeout: 260 seconds) | 13:50 | |
| *** Joins: moto-moi (~hylke@2001:888:13e4:1010:21f:e2ff:fe0c:ce28) | 13:50 | |
| *** Joins: JonMarkGo (~Jon@ool-18bfe16f.dyn.optonline.net) | 15:23 | |
| *** Joins: giallu (~giallu@fedora/giallu) | 15:25 | |
| *** Quits: moto-moi (~hylke@2001:888:13e4:1010:21f:e2ff:fe0c:ce28) (Ping timeout: 260 seconds) | 16:48 | |
| *** Quits: daryn (~daryn@h158.249.190.173.static.ip.windstream.net) (Quit: Ex-Chat) | 18:03 | |
| *** Quits: JonMarkGo (~Jon@ool-18bfe16f.dyn.optonline.net) (Ping timeout: 240 seconds) | 18:30 | |
| *** Quits: leethax (~Cupez@541DAC85.cm-5-6c.dynamic.ziggo.nl) (Quit: I give up...) | 18:32 | |
| *** Joins: paul__ (~IceChat09@2001:470:9310:aaaa:5402:573c:3511:7110) | 18:37 | |
| *** Quits: scribe9343423 (~scribe934@static.96.23.63.178.clients.your-server.de) (Remote host closed the connection) | 19:00 | |
| *** Joins: scribe9343423 (~scribe934@static.96.23.63.178.clients.your-server.de) | 19:00 | |
| *** Quits: paul__ (~IceChat09@2001:470:9310:aaaa:5402:573c:3511:7110) (Quit: Take my advice. I don't use it anyway) | 19:03 | |
| *** Joins: JonMarkGo (~Jon@ool-18bfe16f.dyn.optonline.net) | 19:46 | |
| *** Joins: daryn (~daryn@rrcs-173-198-149-180.west.biz.rr.com) | 20:01 | |
| *** Quits: giallu (~giallu@fedora/giallu) (Ping timeout: 252 seconds) | 20:05 | |
| *** Quits: foobot (~supybot@leetcode.net) (Remote host closed the connection) | 21:10 | |
| *** Quits: daryn (~daryn@rrcs-173-198-149-180.west.biz.rr.com) (Quit: Ex-Chat) | 21:10 | |
| *** Joins: foobot (~supybot@leetcode.net) | 21:10 | |
Generated by irclog2html.py 2.9.2 by Marius Gedminas - find it at mg.pov.lt!