| *** Quits: JonMarkGo (~Jon@ool-18bfe16f.dyn.optonline.net) (Ping timeout: 264 seconds) | 00:32 | |
| *** Joins: dhx1 (~anonymous@60-242-108-164.static.tpgi.com.au) | 01:49 | |
| *** Quits: dhx1 (~anonymous@60-242-108-164.static.tpgi.com.au) (Read error: Connection reset by peer) | 02:28 | |
| *** Joins: Cupertino (~Cupez@unaffiliated/cupertino) | 02:29 | |
| *** Joins: Rixie (~Rixie@0x4dd7390e.adsl.cybercity.dk) | 02:45 | |
| *** Quits: siebrand (~chatzilla@535392CA.cm-6-4c.dynamic.ziggo.nl) (Ping timeout: 250 seconds) | 03:02 | |
| *** skayser_ is now known as skayser | 03:02 | |
| *** Joins: moto-moi (~hylke@2001:888:13e4:1010:21f:e2ff:fe0c:ce28) | 03:08 | |
| *** Joins: kirillka (~Miranda@195.242.142.17) | 03:34 | |
| *** Joins: rolfkleef (~rolfkleef@92.254.21.180) | 04:23 | |
| *** Quits: AAntoine (~brenner@a9-47-22.cnt.nerim.net) (Quit: bye bye) | 04:49 | |
| *** Quits: micahg (~micah@ubuntu/member/micahg) (Ping timeout: 250 seconds) | 05:11 | |
| *** Joins: dhx1 (~anonymous@60-242-108-164.static.tpgi.com.au) | 05:35 | |
| *** Joins: geemee (~gavin@mailhost.exterity.com) | 06:25 | |
| geemee | Hi there, Just noticed that email notifications sometimes send emails out with a link saying http://localhost..... other emails have the corrrect address http://mantis | 06:26 |
|---|---|---|
| geemee | strangly the hostname of the box is actually mantis also. | 06:26 |
| geemee | so where is it pickuing up localhost when sending out emails and how can I modify / force it to show the correct url? | 06:27 |
| geemee | only reference to localhost is the database setup | 06:29 |
| moto-moi | maybe it uses somewhere $_SERVER or something like that? | 06:48 |
| moto-moi | Although I have never seen that bug in my installation, but I also never have used http://localhost to browse to my mantis installation :P | 06:48 |
| geemee | Hi Moto-moi I notice don forums about G-path. is this used in latest mantis? We dont browse localhost form mantis since it is a server without GUI. | 06:55 |
| moto-moi | I have no idea, I'm not a mantis developer :) | 06:59 |
| *** Quits: geemee (~gavin@mailhost.exterity.com) (Remote host closed the connection) | 07:15 | |
| kirillka | hi all | 08:18 |
| kirillka | how I can config notification: changed all status - send mail. change status to CLOSED - not send mail ? | 08:20 |
| kirillka | for now all changes status - send email | 08:20 |
| *** Joins: daryn (~daryn@h158.249.190.173.static.ip.windstream.net) | 09:05 | |
| *** Quits: daryn (~daryn@h158.249.190.173.static.ip.windstream.net) (Quit: Ex-Chat) | 09:22 | |
| *** Joins: daryn (~daryn@h158.249.190.173.static.ip.windstream.net) | 09:25 | |
| *** Quits: kirillka (~Miranda@195.242.142.17) (Quit: kirillka) | 09:55 | |
| jimmy___ | daryn: thank you | 10:03 |
| daryn | np | 10:03 |
| *** Joins: JonMarkGo (~Jon@ool-18bfe16f.dyn.optonline.net) | 10:05 | |
| *** Parts: Rixie (~Rixie@0x4dd7390e.adsl.cybercity.dk) | 10:06 | |
| *** Quits: dhx1 (~anonymous@60-242-108-164.static.tpgi.com.au) (Read error: Connection reset by peer) | 10:29 | |
| *** Joins: dhx1 (~anonymous@60-242-108-164.static.tpgi.com.au) | 10:30 | |
| *** Quits: Cupertino (~Cupez@unaffiliated/cupertino) (Quit: I give up...) | 11:02 | |
| *** Joins: micahg (~micah@ubuntu/member/micahg) | 11:05 | |
| *** Quits: micahg (~micah@ubuntu/member/micahg) (Ping timeout: 276 seconds) | 11:26 | |
| *** Joins: micahg (~micah@ubuntu/member/micahg) | 11:33 | |
| jimmy___ | daryn: When I checkout the tag (and make a new ref?) do you expect that my working directory will contain files and folders that were commited later? I currently see folders that shouldn't have existed yet when the tag was made | 11:50 |
| daryn | jimmy___: checking out a tag is a little different than checking out a branch and tbh I'm not 100% sure | 11:52 |
| daryn | i believe dirs and files that exist in the previously active branch but not in the checked out tag/branch do remain in the working directory but are not part of the index. | 11:54 |
| daryn | in this case you must be careful not to add them to the index when commiting and probably should just delete them to be safe. | 11:54 |
| daryn | jreese is more experienced than I with git so he may have a more complete/better answer | 11:55 |
| jimmy___ | daryn: thank you. I think I understand what you're saying. | 11:55 |
| daryn | it took me awhile to get used to the way git handles the working directory and index | 11:56 |
| daryn | but I wouldn't want to go back now that I (mostly) get git. | 11:57 |
| jreese | jimmy___: should have mentioned this the other day, but you might want to consider masing your work off of the master-1.1.x branch rather than the 1.1.8 tag, as there are some patches on master-1.1.x iirc that have not yet been released | 12:23 |
| jreese | but if you still want to work from the 1.1.8 tag, it would be best if you create a new (local) branch from the tag, and use that to commit and track all of your changes | 12:24 |
| jreese | eg, `git branch newbranchname release-1.1.8|master-1.1.x` | 12:25 |
| jimmy___ | ok. Either way though, I should create a branch of 1.1.8 or 1.1.x against which to record my changes | 12:26 |
| jreese | right | 12:26 |
| jimmy___ | wait, does that command merge 1.1.x and 1.1.8, and then make a new branch? | 12:26 |
| jreese | no, just pick one of the two points to use, and it will create a new branch starting at that ref | 12:27 |
| jreese | eg `git branch newname master-1.1.x` or `git branch newname release-1.1.8` | 12:27 |
| jimmy___ | jreese: didn't notice the pipe, nice. also, once i've done this, is there a command that will clean out files not associated with the tag? Or I guess, do I need to make sure I don't commit any files that I didn't modify that might show up as not being in the branch? | 12:28 |
| jreese | jimmy___: as long as you don't `git add` files that you don't want tracked or committed, you should be fine | 12:29 |
| jimmy___ | jreese: thank you very much | 12:29 |
| jreese | otherwise, you could also consider modifying .gitignore to let git know that you never want those files tracked | 12:29 |
| daryn | jreese: i've run across this where I've added new directories or files specific to a feature branch that somehow persist as untracked when I revert to a different branch. if that's the case here then you don't want to .gitignore. | 12:31 |
| jimmy___ | jreese: I don't see a master-1.1.x | 12:32 |
| jreese | as long as you've committed those files, they shouldn't persist if you checkout a different branch or revision -- if they are untracked, then git takes the safe action and leaves them alone | 12:33 |
| jreese | jimmy___: sorry, origin/master-1.1.x | 12:33 |
| jimmy___ | jreese: I see an origin/master-1.2.x | 12:33 |
| jreese | jimmy___: did you clone from github? | 12:34 |
| jimmy___ | yes, but then checked out 1.1.8 | 12:34 |
| jreese | apparently I never set up my mirror script to push 1.1.x | 12:35 |
| jreese | give me a moment and I'll push master-1.1.x to github | 12:35 |
| jimmy___ | jreese: Well, I could be doing something wrong. Oh ok | 12:35 |
| jimmy___ | jreese: Thanks! | 12:35 |
| jreese | jimmy___: `git fetch` should allow you to see origin/master-1.1.x now | 12:37 |
| jimmy___ | jreese: I see it now, thanks! | 12:43 |
| jreese | you're welcome | 12:43 |
| *** Joins: siebrand (~chatzilla@535392CA.cm-6-4c.dynamic.ziggo.nl) | 12:50 | |
| jimmy___ | jreese: so I see some patches for curing XSS vulerabilities since 1.1.8, and so when I take my files which were modifications against 1.1.8, I should merge them with the ones in 1.1.x and keep 1.1.x changes. Does this sound sane? | 12:55 |
| jimmy___ | jreese: or should I get a branch of 1.1.8, apply my changes first, then figure out how to apply the changes from 1.1.x | 12:57 |
| jreese | I think either one would be fine, although by applying your changes against 1.1.8, you could get git to handle merging or rebasing them to master-1.1.x | 13:01 |
| jreese | or at least attempt to handle | 13:01 |
| jimmy___ | jreese: so once I make my changes against 1.1.8, I should then commit them, and then do some other git command to get the latest changes? | 13:10 |
| jreese | right | 13:10 |
| jimmy___ | jreese: sigh. it doesn't see my changes for a commit. | 13:12 |
| jreese | jimmy___: you need to `git add` any files you've modified before it will commit them | 13:13 |
| jreese | `git add -u` will automatically add all changed files | 13:13 |
| daryn | thanks john...I hadn't discovered that one yet. | 13:15 |
| jreese | daryn: we all learn something every day :P | 13:15 |
| jimmy___ | jreese: ok I could use a hint. after I commit my changes to 1.1.8 into a new branch, what git concept is used to apply other commits? | 13:22 |
| jreese | `git merge` will do a traditional merge, vs `git rebase` which will "replay" commits as patches onto the target branch, and is usually what I would prefer in that sort of instance | 13:23 |
| jimmy___ | jreese: thanks, I don't know enough to know what the difference is, but I'll look it up later. | 13:23 |
| jreese | http://docs.mantisbt.org/master/en/developers/dev.appendix.html#DEV.APPENDIX.GIT | 13:24 |
| jreese | also useful: http://progit.org/book/ | 13:25 |
| jimmy___ | excellent | 13:25 |
| *** Joins: Cupertino (~Cupez@unaffiliated/cupertino) | 13:51 | |
| *** Quits: rolfkleef (~rolfkleef@92.254.21.180) (Ping timeout: 246 seconds) | 14:19 | |
| *** Quits: Cupertino (~Cupez@unaffiliated/cupertino) (Quit: I give up...) | 14:23 | |
| *** Quits: foobot (~supybot@leetcode.net) (Remote host closed the connection) | 14:39 | |
| *** Joins: foobot (~supybot@leetcode.net) | 14:39 | |
| jimmy___ | my flipping changes keep getting overwritten. oh well. I'm done with this. Thanks for the help | 14:43 |
| *** Joins: rolfkleef (~rolfkleef@urtica.xs4all.nl) | 15:46 | |
| *** Quits: moto-moi (~hylke@2001:888:13e4:1010:21f:e2ff:fe0c:ce28) (Read error: Operation timed out) | 17:39 | |
| *** Quits: daryn (~daryn@h158.249.190.173.static.ip.windstream.net) (Quit: Ex-Chat) | 17:48 | |
| *** Quits: rolfkleef (~rolfkleef@urtica.xs4all.nl) (Read error: Operation timed out) | 18:53 | |
| *** 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: JonMarkGo (~Jon@ool-18bfe16f.dyn.optonline.net) (Ping timeout: 240 seconds) | 19:48 | |
| *** Quits: foobot (~supybot@leetcode.net) (*.net *.split) | 20:33 | |
| *** Quits: siebrand (~chatzilla@535392CA.cm-6-4c.dynamic.ziggo.nl) (*.net *.split) | 20:33 | |
| *** Quits: phrenic (~phr3n1c@feldstudie.net) (*.net *.split) | 20:33 | |
| *** Quits: killefiz (~sven@fedora/pdpc.base.killefiz) (*.net *.split) | 20:33 | |
| *** Quits: Zeeshan_M (developer@f.je) (*.net *.split) | 20:33 | |
| *** Quits: chilts (~chilts@184-106-200-232.static.cloud-ips.com) (*.net *.split) | 20:33 | |
| *** Quits: chris38`` (~chris38@bayle.eu) (*.net *.split) | 20:33 | |
| *** Quits: tavasti (~tavasti@ov1.tavasti.fi) (*.net *.split) | 20:33 | |
| *** Quits: wolog (~wolog@wolog.info) (*.net *.split) | 20:33 | |
| *** Quits: jimmy___ (42d8a452@gateway/web/freenode/ip.66.216.164.82) (*.net *.split) | 20:33 | |
| *** Quits: CIA-27 (~CIA@208.69.182.149) (*.net *.split) | 20:33 | |
| *** Quits: micahg (~micah@ubuntu/member/micahg) (*.net *.split) | 20:33 | |
| *** Quits: skayser (~ska@vserver01.sebastiankayser.de) (*.net *.split) | 20:33 | |
| *** Quits: dhx1 (~anonymous@60-242-108-164.static.tpgi.com.au) (*.net *.split) | 20:33 | |
| *** Quits: Ragnor (~Ragnor@dslb-092-072-246-170.pools.arcor-ip.net) (*.net *.split) | 20:33 | |
| *** Quits: scribe9343423 (~scribe934@static.96.23.63.178.clients.your-server.de) (*.net *.split) | 20:33 | |
| *** Quits: PennStater (Aaron@unaffiliated/pennstater) (*.net *.split) | 20:33 | |
| *** Joins: scribe9343423 (~scribe934@static.96.23.63.178.clients.your-server.de) | 20:43 | |
| *** Joins: foobot (~supybot@leetcode.net) | 20:43 | |
| *** Joins: siebrand (~chatzilla@535392CA.cm-6-4c.dynamic.ziggo.nl) | 20:43 | |
| *** Joins: micahg (~micah@ubuntu/member/micahg) | 20:43 | |
| *** Joins: dhx1 (~anonymous@60-242-108-164.static.tpgi.com.au) | 20:43 | |
| *** Joins: Zeeshan_M (developer@f.je) | 20:43 | |
| *** Joins: jimmy___ (42d8a452@gateway/web/freenode/ip.66.216.164.82) | 20:43 | |
| *** Joins: tavasti (~tavasti@ov1.tavasti.fi) | 20:43 | |
| *** Joins: PennStater (Aaron@unaffiliated/pennstater) | 20:43 | |
| *** Joins: chilts (~chilts@184-106-200-232.static.cloud-ips.com) | 20:43 | |
| *** Joins: phrenic (~phr3n1c@feldstudie.net) | 20:43 | |
| *** Joins: skayser (~ska@vserver01.sebastiankayser.de) | 20:43 | |
| *** Joins: CIA-27 (~CIA@208.69.182.149) | 20:43 | |
| *** Joins: Ragnor (~Ragnor@dslb-092-072-246-170.pools.arcor-ip.net) | 20:43 | |
| *** Joins: wolog (~wolog@wolog.info) | 20:43 | |
| *** Joins: chris38`` (~chris38@bayle.eu) | 20:43 | |
| *** Joins: killefiz (~sven@fedora/pdpc.base.killefiz) | 20:43 | |
| *** Quits: foobot (~supybot@leetcode.net) (*.net *.split) | 20:45 | |
| *** Quits: siebrand (~chatzilla@535392CA.cm-6-4c.dynamic.ziggo.nl) (*.net *.split) | 20:45 | |
| *** Quits: phrenic (~phr3n1c@feldstudie.net) (*.net *.split) | 20:45 | |
| *** Quits: killefiz (~sven@fedora/pdpc.base.killefiz) (*.net *.split) | 20:45 | |
| *** Quits: Zeeshan_M (developer@f.je) (*.net *.split) | 20:45 | |
| *** Quits: chilts (~chilts@184-106-200-232.static.cloud-ips.com) (*.net *.split) | 20:45 | |
| *** Quits: chris38`` (~chris38@bayle.eu) (*.net *.split) | 20:45 | |
| *** Quits: tavasti (~tavasti@ov1.tavasti.fi) (*.net *.split) | 20:45 | |
| *** Quits: wolog (~wolog@wolog.info) (*.net *.split) | 20:45 | |
| *** Quits: jimmy___ (42d8a452@gateway/web/freenode/ip.66.216.164.82) (*.net *.split) | 20:45 | |
| *** Quits: CIA-27 (~CIA@208.69.182.149) (*.net *.split) | 20:45 | |
| *** Quits: micahg (~micah@ubuntu/member/micahg) (*.net *.split) | 20:45 | |
| *** Quits: skayser (~ska@vserver01.sebastiankayser.de) (*.net *.split) | 20:45 | |
| *** Quits: dhx1 (~anonymous@60-242-108-164.static.tpgi.com.au) (*.net *.split) | 20:46 | |
| *** Quits: Ragnor (~Ragnor@dslb-092-072-246-170.pools.arcor-ip.net) (*.net *.split) | 20:46 | |
| *** Quits: scribe9343423 (~scribe934@static.96.23.63.178.clients.your-server.de) (*.net *.split) | 20:46 | |
| *** Quits: PennStater (Aaron@unaffiliated/pennstater) (*.net *.split) | 20:46 | |
| *** Joins: scribe9343423 (~scribe934@static.96.23.63.178.clients.your-server.de) | 20:51 | |
| *** Joins: foobot (~supybot@leetcode.net) | 20:51 | |
| *** Joins: siebrand (~chatzilla@535392CA.cm-6-4c.dynamic.ziggo.nl) | 20:51 | |
| *** Joins: micahg (~micah@ubuntu/member/micahg) | 20:51 | |
| *** Joins: dhx1 (~anonymous@60-242-108-164.static.tpgi.com.au) | 20:51 | |
| *** Joins: Zeeshan_M (developer@f.je) | 20:51 | |
| *** Joins: jimmy___ (42d8a452@gateway/web/freenode/ip.66.216.164.82) | 20:51 | |
| *** Joins: tavasti (~tavasti@ov1.tavasti.fi) | 20:51 | |
| *** Joins: PennStater (Aaron@unaffiliated/pennstater) | 20:51 | |
| *** Joins: chilts (~chilts@184-106-200-232.static.cloud-ips.com) | 20:51 | |
| *** Joins: phrenic (~phr3n1c@feldstudie.net) | 20:51 | |
| *** Joins: skayser (~ska@vserver01.sebastiankayser.de) | 20:51 | |
| *** Joins: CIA-27 (~CIA@208.69.182.149) | 20:51 | |
| *** Joins: Ragnor (~Ragnor@dslb-092-072-246-170.pools.arcor-ip.net) | 20:51 | |
| *** Joins: wolog (~wolog@wolog.info) | 20:51 | |
| *** Joins: chris38`` (~chris38@bayle.eu) | 20:51 | |
| *** Joins: killefiz (~sven@fedora/pdpc.base.killefiz) | 20:51 | |
| *** Joins: JonMarkGo (~Jon@ool-18bfe16f.dyn.optonline.net) | 22:36 | |
Generated by irclog2html.py 2.9.2 by Marius Gedminas - find it at mg.pov.lt!