| *** piet has quit IRC | 00:36 | |
| *** piet has joined #openstack-product | 01:57 | |
| *** piet has quit IRC | 02:21 | |
| *** piet_ has joined #openstack-product | 02:53 | |
| openstackgerrit | Merged openstack/openstack-user-stories: Add URL of the rendered HTML content to README https://review.openstack.org/318253 | 02:54 |
|---|---|---|
| *** piet_ has quit IRC | 03:11 | |
| *** piet_ has joined #openstack-product | 03:11 | |
| openstackgerrit | Ken Johnston proposed openstack/openstack-user-stories: Remove Draft and Tracked from Spec Rendering https://review.openstack.org/319039 | 03:37 |
| *** piet_ has quit IRC | 03:53 | |
| openstackgerrit | Merged openstack/openstack-user-stories: Remove Draft and Tracked from Spec Rendering https://review.openstack.org/319039 | 03:55 |
| openstackgerrit | Ken Johnston proposed openstack/openstack-user-stories: Minor Changes to High Scale Media https://review.openstack.org/319043 | 04:00 |
| *** piet_ has joined #openstack-product | 04:06 | |
| *** piet_ has quit IRC | 04:23 | |
| *** piet has joined #openstack-product | 04:23 | |
| openstackgerrit | Merged openstack/openstack-user-stories: Add Categorized Configuration Story https://review.openstack.org/291406 | 04:27 |
| openstackgerrit | Ken Johnston proposed openstack/openstack-user-stories: Removing Duplicative High Scale Media User Story https://review.openstack.org/319050 | 04:47 |
| *** piet has quit IRC | 05:01 | |
| *** xenthree3 has joined #openstack-product | 12:02 | |
| *** xenthree3 has left #openstack-product | 12:02 | |
| *** piet has joined #openstack-product | 12:18 | |
| *** piet has quit IRC | 12:40 | |
| *** piet has joined #openstack-product | 12:43 | |
| *** piet has quit IRC | 12:55 | |
| kencjohnston | good morning team. | 14:02 |
| kencjohnston | Anyone here want to help me with a git issue I'm experiencing? | 14:03 |
| Zara | I'm lurking around this channel, what's the issue? if nothing else I might know who to point you to. :) | 14:06 |
| kencjohnston | thanks Zara | 14:08 |
| kencjohnston | I've cloned the openstack-user-stories repo | 14:08 |
| kencjohnston | and I think because there are two versions of one file that differ only on case, that it assumes I've made a change | 14:08 |
| kencjohnston | maybe because I'm on a mac | 14:08 |
| kencjohnston | anyway, I submitted a change to remove the duplicate file - https://review.openstack.org/#/c/290991/ | 14:09 |
| kencjohnston | but because that file is in master I can't seem to git review -d any change until it is resolved. | 14:09 |
| kencjohnston | I get "Please, commit your changes or stash them before you can switch branches. Aborting" | 14:09 |
| kencjohnston | when i do git stash, then git status it stills says I've modified a file | 14:10 |
| Zara | hm, can you paste what git shows you? (http://paste.openstack.org/) | 14:12 |
| kencjohnston | http://paste.openstack.org/show/497914/ | 14:13 |
| kencjohnston | I'm wondering if there is a way to have my file-system recognize case sensitive files in this directory | 14:15 |
| kencjohnston | or configure git in such a way as to manage case sensitive files | 14:15 |
| Zara | well, I don't know exactly what's going on, but if you don't need the things it thinks have changed, `git checkout master` then `git reset --hard HEAD` then `git pull` should be enough to get your master branch up to date? | 14:17 |
| kencjohnston | yeah I do that, but once my master branch is up to date it still thinks there is a change, because my machine believes the two files are the same. | 14:18 |
| kencjohnston | http://paste.openstack.org/show/497918/ | 14:19 |
| Zara | ohh, I see, sorry... | 14:20 |
| kencjohnston | no worries. | 14:20 |
| kencjohnston | I'm just a bit stuck, and these files seem to have been around for awhile so I'm wondering why it happened now. | 14:21 |
| SotK | what does the output of `git diff` look like? | 14:22 |
| kencjohnston | A whole bunch of changes between the two files | 14:22 |
| kencjohnston | that it now thinks are one. | 14:22 |
| Zara | could you paste it for us? (we may still have no idea what to do, but maybe!) | 14:23 |
| kencjohnston | http://paste.openstack.org/show/497920/ | 14:24 |
| SotK | does doing `git checkout -- user-stories/proposed/high-scale-media-Telco-apps.rst` help? | 14:28 |
| kencjohnston | no | 14:29 |
| kencjohnston | http://paste.openstack.org/show/497921/ | 14:29 |
| kencjohnston | I'm wondering, is there a way to tell git to ignore a file completely? | 14:29 |
| kencjohnston | that would get me past my current block while I wait for the de-dupe to merge | 14:30 |
| Zara | yes, you can add the file to .gitignore (though it looks like the command you entered was capitatlized differently to the one sotk gave) | 14:31 |
| kencjohnston | sorry, how do I add it to .gitignore? | 14:31 |
| kencjohnston | Zara I actually tried both capitalization versions with git checkout | 14:31 |
| Zara | ahh, right | 14:32 |
| kencjohnston | both still said I had uncommitted changes | 14:32 |
| * SotK notices "maybe because I'm on a mac" | 14:32 | |
| kencjohnston | haha | 14:32 |
| Zara | okay, I don't use a mac so I don't know if you can see .gitignore by default, the . makes files hidden on linux | 14:32 |
| kencjohnston | I'm fairly certain it is because my volume ignores case | 14:32 |
| SotK | yeah, that seems probable | 14:32 |
| Zara | there should be a file called `.gitignore` in the same directory, anyway, and you can give list the file in there (I'll see if I can find an example) | 14:33 |
| SotK | yup, there'll be a .gitignore file in the top level of the git repo | 14:34 |
| SotK | adding user-stories/proposed/high-scale-media-Telco-apps.rst to it should help I think | 14:35 |
| Zara | yeah, you just need to put that in it, no need for any other instructions or anything | 14:36 |
| Zara | I was going to link my storyboard one but I think that would actually be more confusing! | 14:36 |
| Zara | (okay, googling around it looks like macs also use the . to hide files, so I'd guess it won't be visible by default.) | 14:38 |
| kencjohnston | that's ok i can still vim .gitignore | 14:39 |
| Zara | ah, cool | 14:39 |
| openstackgerrit | Jim Rollenhagen proposed openstack/openstack-user-stories: Remove duplicate high-scale-media-telco-apps https://review.openstack.org/319304 | 15:08 |
| Zara | (I'm heading home soon, will see logs for this channel on Monday if adding the file to .gitignore doesn't help.) | 15:09 |
| openstackgerrit | Ken Johnston proposed openstack/openstack-user-stories: Revert "High Scale Media Telco Apps User Story" https://review.openstack.org/319311 | 15:15 |
| *** jsavak has joined #openstack-product | 15:36 | |
| kencjohnston | thanks for your help Zara | 15:44 |
| *** jsavak has quit IRC | 16:44 | |
| openstackgerrit | Merged openstack/openstack-user-stories: Revert "High Scale Media Telco Apps User Story" https://review.openstack.org/319311 | 18:34 |
| kencjohnston | and now I am happy :) | 19:12 |
| openstackgerrit | Ken Johnston proposed openstack/openstack-user-stories: Adds Fleet Management User Story https://review.openstack.org/299531 | 20:24 |
| openstackgerrit | Yih Leong Sun proposed openstack/openstack-user-stories: Adds Fleet Management User Story https://review.openstack.org/299531 | 21:04 |
| openstackgerrit | Yih Leong Sun proposed openstack/openstack-user-stories: High Availability of Virtual Machines. https://review.openstack.org/318431 | 21:21 |
| openstackgerrit | Merged openstack/openstack-user-stories: Adds Fleet Management User Story https://review.openstack.org/299531 | 21:41 |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!