You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@edgent.apache.org by queeniema <gi...@git.apache.org> on 2016/04/29 00:29:45 UTC
[GitHub] incubator-quarks-website pull request: [QUARKS-153] Document style...
GitHub user queeniema opened a pull request:
https://github.com/apache/incubator-quarks-website/pull/51
[QUARKS-153] Document style guide for website consistency
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/queeniema/incubator-quarks-website QUARKS-153
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-quarks-website/pull/51.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #51
----
commit 923e23c6d33940cca5a0861c0c30c4001d6e0af8
Author: Queenie Ma <qu...@gmail.com>
Date: 2016-04-28T22:27:17Z
[QUARKS-153] Document style guide for website consistency
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quarks-website pull request: [QUARKS-153] Document style...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-quarks-website/pull/51
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
Re: [GitHub] incubator-quarks-website pull request: [QUARKS-153] Document style...
Posted by Dale LaBossiere <dm...@gmail.com>.
You didn’t have a build.sh because running build.sh checks out the asf-site branch and leaves you in that state.
The asf-site branch only contains the “content” folder.
You have to “git checkout master” to get back to the master branch where all the “normal” repo objects are visible.
In any case it may be best to start afresh at this point :-)
> On Apr 29, 2016, at 3:12 PM, home4slc <gi...@git.apache.org> wrote:
>
> Github user home4slc commented on the pull request:
>
> https://github.com/apache/incubator-quarks-website/pull/51#issuecomment-215851894
>
> Thanks.. I did not because I did not have a build.sh at that point.
>
> I’m thinking of blowing everything away and starting fresh.
>
> Thanks,
>
> Susan
>
>> On Apr 29, 2016, at 11:32 AM, Dale LaBossiere <no...@github.com> wrote:
>>
>> FYI, I just merged another PR and did a build.sh/push w/o incident.
>> The existing build.sh/push didn't complain, so @home4slc <https://github.com/home4slc> I'm guessing you didn't yet do build.sh/push from #51 <https://github.com/apache/incubator-quarks-website/pull/51>? (and your afs-site may be out of sync again)
>> Regardless, #51 <https://github.com/apache/incubator-quarks-website/pull/51>'s content would have been part of my build/push.
>>
>> —
>> You are receiving this because you were mentioned.
>> Reply to this email directly or view it on GitHub <https://github.com/apache/incubator-quarks-website/pull/51#issuecomment-215840757>
>
>
>
>
> ---
> If your project is set up for it, you can reply to this email and have your
> reply appear on GitHub as well. If your project does not have this feature
> enabled and wishes so, or if the feature is enabled but not working, please
> contact infrastructure at infrastructure@apache.org or file a JIRA ticket
> with INFRA.
> ---
[GitHub] incubator-quarks-website pull request: [QUARKS-153] Document style...
Posted by home4slc <gi...@git.apache.org>.
Github user home4slc commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/51#issuecomment-215851894
Thanks.. I did not because I did not have a build.sh at that point.
I\u2019m thinking of blowing everything away and starting fresh.
Thanks,
Susan
> On Apr 29, 2016, at 11:32 AM, Dale LaBossiere <no...@github.com> wrote:
>
> FYI, I just merged another PR and did a build.sh/push w/o incident.
> The existing build.sh/push didn't complain, so @home4slc <https://github.com/home4slc> I'm guessing you didn't yet do build.sh/push from #51 <https://github.com/apache/incubator-quarks-website/pull/51>? (and your afs-site may be out of sync again)
> Regardless, #51 <https://github.com/apache/incubator-quarks-website/pull/51>'s content would have been part of my build/push.
>
> \u2014
> You are receiving this because you were mentioned.
> Reply to this email directly or view it on GitHub <https://github.com/apache/incubator-quarks-website/pull/51#issuecomment-215840757>
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quarks-website pull request: [QUARKS-153] Document style...
Posted by dlaboss <gi...@git.apache.org>.
Github user dlaboss commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/51#issuecomment-215732799
Uh not sure but I think so. Try the build.sh emitted git push cmd.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quarks-website pull request: [QUARKS-153] Document style...
Posted by dlaboss <gi...@git.apache.org>.
Github user dlaboss commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/51#issuecomment-215711729
I had gotten myself into a similar situation recently. Wasn't quite sure how I got where I did. In your case you can see that build.sh says your asf-site was behind -- presumably because someone else, like me :-), did the build.sh/push since the last time you did.
I'm getting the feeling build.sh should be ensuring your asf-site is up to date early on. I think the following will do it:
```
$ git fetch asfclone asf-site
$ git checkout asf-site
$ git rebase asfclone/asf-site
```
I wimped out, simply blew away / recreated my asfclone, and then did the build.sh/push again.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quarks-website pull request: [QUARKS-153] Document style...
Posted by dlaboss <gi...@git.apache.org>.
Github user dlaboss commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/51#issuecomment-215840757
FYI, I just merged another PR and did a build.sh/push w/o incident.
The existing build.sh/push didn't complain, so @home4slc I'm guessing you didn't yet do build.sh/push from #51? (and your afs-site may be out of sync again)
Regardless, #51's content would have been part of my build/push.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quarks-website pull request: [QUARKS-153] Document style...
Posted by home4slc <gi...@git.apache.org>.
Github user home4slc commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/51#issuecomment-215602999
I just merged this, but I got an odd error...
Susans-MBP-318:incubator-quarks-website susancline$ sh build.sh
Configuration file: /Users/susancline/git-wip-apache-docs/incubator-quarks-website/site/_config.yml
Source: /Users/susancline/git-wip-apache-docs/incubator-quarks-website/site
Destination: ../content_tmp
Incremental build: disabled. Enable with --incremental
Generating...
done in 0.828 seconds.
Auto-regeneration: disabled. Use --watch to enable.
Switched to branch 'asf-site'
Your branch is behind 'origin/asf-site' by 9 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Committing changes to asf-site branch from master branch
[asf-site 0304cdc] from e1bd198bfd0426a24e71b588db1775039fa9fc5d
40 files changed, 4398 insertions(+), 166 deletions(-)
create mode 100644 content/recipes/recipe_adaptable_deadtime_filter.html
create mode 100644 content/recipes/recipe_adaptable_polling_source.html
create mode 100644 content/recipes/recipe_dynamic_analytic_control.html
You are now on the asf-site branch
Run git push origin asf-site to update the live site.
Susans-MBP-318:incubator-quarks-website susancline$ git push origin asf-site
To https://git-wip-us.apache.org/repos/asf/incubator-quarks-website.git
! [rejected] asf-site -> asf-site (non-fast-forward)
error: failed to push some refs to 'https://git-wip-us.apache.org/repos/asf/incubator-quarks-website.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Susans-MBP-318:incubator-quarks-website susancline$ git push <-- my mistake, I did not read the error above
To https://git-wip-us.apache.org/repos/asf/incubator-quarks-website.git
! [rejected] asf-site -> asf-site (non-fast-forward)
error: failed to push some refs to 'https://git-wip-us.apache.org/repos/asf/incubator-quarks-website.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Now I did a 'git pull' and I got this:
Susans-MBP-318:incubator-quarks-website susancline$ git pull
Merge made by the 'recursive' strategy.
Susans-MBP-318:incubator-quarks-website susancline$ git status
On branch asf-site
Your branch is ahead of 'origin/asf-site' by 2 commits.
(use "git push" to publish your local commits)
Untracked files:
(use "git add <file>..." to include in what will be committed)
_site/
nothing added to commit but untracked files present (use "git add" to track)
Can someone help me untangle this and tell me what I should do?
Thanks, Susan
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quarks-website pull request: [QUARKS-153] Document style...
Posted by home4slc <gi...@git.apache.org>.
Github user home4slc commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/51#issuecomment-215722727
Thanks @dlaboss .
I'm not sure if I was successful or not .. I did the three commands you mentioned using 'origin' instead of 'asfclone' and the last command finished like this:
M content/urls_mydoc.txt
.git/rebase-apply/patch:18: trailing whitespace.
.git/rebase-apply/patch:26: trailing whitespace.
.git/rebase-apply/patch:34: trailing whitespace.
.git/rebase-apply/patch:42: trailing whitespace.
.git/rebase-apply/patch:50: trailing whitespace.
warning: squelched 1900 whitespace errors
warning: 1905 lines add whitespace errors.
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Did it work?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quarks-website pull request: [QUARKS-153] Document style...
Posted by dlaboss <gi...@git.apache.org>.
Github user dlaboss commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/51#issuecomment-215717658
My mistake on "asfclone" in the above git cmds. In your clone of the asf repo, "origin" will be the repo name you need to use.
Once you successfully build/push my asf-site will be behind :-) I'll then do the tweaks to build.sh to get my branch in the right shape and deliver that fix.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---