Friday, 2016-05-20

*** piet has quit IRC00:36
*** piet has joined #openstack-product01:57
*** piet has quit IRC02:21
*** piet_ has joined #openstack-product02:53
openstackgerritMerged openstack/openstack-user-stories: Add URL of the rendered HTML content to README  https://review.openstack.org/31825302:54
*** piet_ has quit IRC03:11
*** piet_ has joined #openstack-product03:11
openstackgerritKen Johnston proposed openstack/openstack-user-stories: Remove Draft and Tracked from Spec Rendering  https://review.openstack.org/31903903:37
*** piet_ has quit IRC03:53
openstackgerritMerged openstack/openstack-user-stories: Remove Draft and Tracked from Spec Rendering  https://review.openstack.org/31903903:55
openstackgerritKen Johnston proposed openstack/openstack-user-stories: Minor Changes to High Scale Media  https://review.openstack.org/31904304:00
*** piet_ has joined #openstack-product04:06
*** piet_ has quit IRC04:23
*** piet has joined #openstack-product04:23
openstackgerritMerged openstack/openstack-user-stories: Add Categorized Configuration Story  https://review.openstack.org/29140604:27
openstackgerritKen Johnston proposed openstack/openstack-user-stories: Removing Duplicative High Scale Media User Story  https://review.openstack.org/31905004:47
*** piet has quit IRC05:01
*** xenthree3 has joined #openstack-product12:02
*** xenthree3 has left #openstack-product12:02
*** piet has joined #openstack-product12:18
*** piet has quit IRC12:40
*** piet has joined #openstack-product12:43
*** piet has quit IRC12:55
kencjohnstongood morning team.14:02
kencjohnstonAnyone here want to help me with a git issue I'm experiencing?14:03
ZaraI'm lurking around this channel, what's the issue? if nothing else I might know who to point you to. :)14:06
kencjohnstonthanks Zara14:08
kencjohnstonI've cloned the openstack-user-stories repo14:08
kencjohnstonand I think because there are two versions of one file that differ only on case, that it assumes I've made a change14:08
kencjohnstonmaybe because I'm on a mac14:08
kencjohnstonanyway, I submitted a change to remove the duplicate file - https://review.openstack.org/#/c/290991/14:09
kencjohnstonbut because that file is in master I can't seem to git review -d any change until it is resolved.14:09
kencjohnstonI get "Please, commit your changes or stash them before you can switch branches. Aborting"14:09
kencjohnstonwhen i do git stash, then git status it stills says I've modified a file14:10
Zarahm, can you paste what git shows you? (http://paste.openstack.org/)14:12
kencjohnstonhttp://paste.openstack.org/show/497914/14:13
kencjohnstonI'm wondering if there is a way to have my file-system recognize case sensitive files in this directory14:15
kencjohnstonor configure git in such a way as to manage case sensitive files14:15
Zarawell, 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
kencjohnstonyeah 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
kencjohnstonhttp://paste.openstack.org/show/497918/14:19
Zaraohh, I see, sorry...14:20
kencjohnstonno worries.14:20
kencjohnstonI'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
SotKwhat does the output of `git diff` look like?14:22
kencjohnstonA whole bunch of changes between the two files14:22
kencjohnstonthat it now thinks are one.14:22
Zaracould you paste it for us? (we may still have no idea what to do, but maybe!)14:23
kencjohnstonhttp://paste.openstack.org/show/497920/14:24
SotKdoes doing `git checkout -- user-stories/proposed/high-scale-media-Telco-apps.rst` help?14:28
kencjohnstonno14:29
kencjohnstonhttp://paste.openstack.org/show/497921/14:29
kencjohnstonI'm wondering, is there a way to tell git to ignore a file completely?14:29
kencjohnstonthat would get me past my current block while I wait for the de-dupe to merge14:30
Zarayes, 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
kencjohnstonsorry, how do I add it to .gitignore?14:31
kencjohnstonZara I actually tried both capitalization versions with git checkout14:31
Zaraahh, right14:32
kencjohnstonboth still said I had uncommitted changes14:32
* SotK notices "maybe because I'm on a mac"14:32
kencjohnstonhaha14:32
Zaraokay, I don't use a mac so I don't know if you can see .gitignore by default, the . makes files hidden on linux14:32
kencjohnstonI'm fairly certain it is because my volume ignores case14:32
SotKyeah, that seems probable14:32
Zarathere 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
SotKyup, there'll be a .gitignore file in the top level of the git repo14:34
SotKadding user-stories/proposed/high-scale-media-Telco-apps.rst to it should help I think14:35
Zarayeah, you just need to put that in it, no need for any other instructions or anything14:36
ZaraI 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
kencjohnstonthat's ok i can still vim .gitignore14:39
Zaraah, cool14:39
openstackgerritJim Rollenhagen proposed openstack/openstack-user-stories: Remove duplicate high-scale-media-telco-apps  https://review.openstack.org/31930415: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
openstackgerritKen Johnston proposed openstack/openstack-user-stories: Revert "High Scale Media Telco Apps User Story"  https://review.openstack.org/31931115:15
*** jsavak has joined #openstack-product15:36
kencjohnstonthanks for your help Zara15:44
*** jsavak has quit IRC16:44
openstackgerritMerged openstack/openstack-user-stories: Revert "High Scale Media Telco Apps User Story"  https://review.openstack.org/31931118:34
kencjohnstonand now I am happy :)19:12
openstackgerritKen Johnston proposed openstack/openstack-user-stories: Adds Fleet Management User Story  https://review.openstack.org/29953120:24
openstackgerritYih Leong Sun proposed openstack/openstack-user-stories: Adds Fleet Management User Story  https://review.openstack.org/29953121:04
openstackgerritYih Leong Sun proposed openstack/openstack-user-stories: High Availability of Virtual Machines.  https://review.openstack.org/31843121:21
openstackgerritMerged openstack/openstack-user-stories: Adds Fleet Management User Story  https://review.openstack.org/29953121:41

Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!