[NBP web-reskin] Camp29 git error
Didomenico, Steven
steven.didomenico at fmr.com
Thu Nov 5 09:48:52 EST 2009
Hi Edie,
Yes, HEAD_P is a current version. This weekend I'm going to have to
cleanup some of my own work.
If I delete a template, do I then do a commit and push to have it
deleted from the Camp29 and the master Camp?
I'll have to make some notes on "git checkout'
Thanks,
Steve
_____
From: web-reskin-bounces at nbp.org
[mailto:web-reskin-bounces at nbp.org] On Behalf Of Edie Coletti
Sent: Thursday, November 05, 2009 9:44 AM
To: 'Discussions regarding the 2009 UI reskin of nbp.org'
Subject: RE: [NBP web-reskin] Camp29 git error
I'm working on getting your camp29 back in sync. Is your version
of catalogs/nbp/templates/regions/HEAD_P the most current version? Also,
I did a "git checkout - filename" for homepage.html, index.html, and
main_font.css to get back in sync with the master. I made copies of
these files, so if you want to retain the then I'll copy them back and
commit them.
_____
From: web-reskin-bounces at nbp.org
[mailto:web-reskin-bounces at nbp.org] On Behalf Of
swdidomenico at comcast.net
Sent: Thursday, November 05, 2009 8:06 AM
To: Web-reskin at nbp.org
Subject: [NBP web-reskin] Camp29 git error
I added page site.html, commited it, and did a git push.
I got an error duing the git push. Is there a way to check to
see if site.html is in the "Master" camp?
As you can see below that at one time site.html was listed in my
git status. Now my git status does not show up in a git status.
I also did a git pull to see if that would fix the problem. It
did not. I also restarted Interchange and that did not help either.
Does the Camp have to be recycled?
Here is the error:
[fidelity_camp at tp6 pages]$ git push
To /home/camp/reskin/nbp.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to '/home/camp/reskin/nbp.git'
Here is a log of activity:
camp26 camp28 camp29 camp30 camp31 productionfiles tmp
[fidelity_camp at tp6 ~]$ cd camp29
[fidelity_camp at tp6 camp29]$ dir
bin catalogs cgi-bin htdocs httpd interchange pgsql tmp
[fidelity_camp at tp6 camp29]$ cd catalogs
[fidelity_camp at tp6 catalogs]$ dir
nbp
[fidelity_camp at tp6 catalogs]$ cd nbp
[fidelity_camp at tp6 nbp]$ dir
catalog.cfg estimate_uploads logs schema
special_pages
catalog_local.cfg etc nbp.structure scripts
templates
custom images orders session
tmp
elist include pages sitemap.xml
error.log jobs products soft_goods
[fidelity_camp at tp6 nbp]$ cd pages
[fidelity_camp at tp6 pages]$ dir
account.html homepage.htm production
admin homepage.html publications
affiliate index_ascent_color.html
publications_ascent.html
all_products.html index_ascent.html query
alphabet.jpg index-handson.html readbooks
braille index-highlights.html SCW-1YR.html
buzzard.html index.html SCW-2YR.html
cart.html index_new.html
set-volatile.html
cbbc index_old.html ship_check.html
change_email.html index_template_test.html site.html
change_password.html index.twav.html sitemap.html
checkout login.html
sitemap_new.html
clear-session.html logo.jpg sitemap.xml
company logout.html
site_search_results.html
contact_thanks.html lost_password.html
soft_goods_download.html
customerservice.html louis
special_dump.html
customize.html mydownloads.html StylesNew.css
dump.html nagios.html support
education new_account.html t-alt.html
example.html new-raff.html tour
find.html OS.html twav.html
flypage.html our_president.html video.jpg
flypage_textbook.html pic1.jpg with_twav.html
[fidelity_camp at tp6 pages]$ dir site.html
site.html
[fidelity_camp at tp6 pages]$ git add site.html
[fidelity_camp at tp6 pages]$ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# new file: site.html
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in
working directory)
#
# modified: homepage.html
# modified: index.html
# modified: ../../../htdocs/nbp/main_font.css
#
# Untracked files:
# (use "git add <file>..." to include in what will be
committed)
#
# index_new.html
# index_old.html
# index_template_test.html
# ../templates/regions/FOOT_P
# ../templates/regions/HEAD_P
# ../templates/regions/MENU_P
# ../templates/regions/STEVE_TEMPLATE
# ../templates/regions/TITLE
# ../templates/regions/TOP_P
[fidelity_camp at tp6 pages]$ cd..
-bash: cd..: command not found
[fidelity_camp at tp6 pages]$ cd\
> dir
-bash: cddir: command not found
[fidelity_camp at tp6 pages]$ cd.
-bash: cd.: command not found
[fidelity_camp at tp6 pages]$ cd..
-bash: cd..: command not found
[fidelity_camp at tp6 pages]$ dir
account.html homepage.htm production
admin homepage.html publications
affiliate index_ascent_color.html
publications_ascent.html
all_products.html index_ascent.html query
alphabet.jpg index-handson.html readbooks
braille index-highlights.html SCW-1YR.html
buzzard.html index.html SCW-2YR.html
cart.html index_new.html
set-volatile.html
cbbc index_old.html ship_check.html
change_email.html index_template_test.html site.html
change_password.html index.twav.html sitemap.html
checkout login.html
sitemap_new.html
clear-session.html logo.jpg sitemap.xml
company logout.html
site_search_results.html
contact_thanks.html lost_password.html
soft_goods_download.html
customerservice.html louis
special_dump.html
customize.html mydownloads.html StylesNew.css
dump.html nagios.html support
education new_account.html t-alt.html
example.html new-raff.html tour
find.html OS.html twav.html
flypage.html our_president.html video.jpg
flypage_textbook.html pic1.jpg with_twav.html
[fidelity_camp at tp6 pages]$ git commit
[master 573648f] Steve DiDomenico - adding new page site.html
1 files changed, 9 insertions(+), 0 deletions(-)
create mode 100644 catalogs/nbp/pages/site.html
[fidelity_camp at tp6 pages]$ git push --dry --run
error: unknown option `run'
usage: git push [--all | --mirror] [--dry-run] [--tags]
[--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force]
[-v] [<repository> <refspec>...]
-v, --verbose be verbose
--repo <repository> repository
--all push all refs
--mirror mirror all refs
--tags push tags
--dry-run dry run
-f, --force force updates
--thin use thin pack
--receive-pack <receive-pack>
receive pack program
--exec <receive-pack>
receive pack program
[fidelity_camp at tp6 pages]$ git push --dry-run
To /home/camp/reskin/nbp.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to '/home/camp/reskin/nbp.git'
[fidelity_camp at tp6 pages]$ git push
To /home/camp/reskin/nbp.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to '/home/camp/reskin/nbp.git'
[fidelity_camp at tp6 pages]$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in
working directory)
#
# modified: homepage.html
# modified: index.html
# modified: ../../../htdocs/nbp/main_font.css
#
# Untracked files:
# (use "git add <file>..." to include in what will be
committed)
#
# index_new.html
# index_old.html
# index_template_test.html
# ../templates/regions/FOOT_P
# ../templates/regions/HEAD_P
# ../templates/regions/MENU_P
# ../templates/regions/STEVE_TEMPLATE
# ../templates/regions/TITLE
# ../templates/regions/TOP_P
no changes added to commit (use "git add" and/or "git commit
-a")
[fidelity_camp at tp6 pages]$ git -push
Unknown option: -push
usage: git [--version] [--exec-path[=GIT_EXEC_PATH]]
[-p|--paginate|--no-pager] [--bare] [--git-dir=GIT_DIR]
[--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]
[fidelity_camp at tp6 pages]$ git push
To /home/camp/reskin/nbp.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to '/home/camp/reskin/nbp.git'
[fidelity_camp at tp6 pages]$ [fidelity_camp at tp6 pages]$ git push
-bash: [fidelity_camp at tp6: command not found
[fidelity_camp at tp6 pages]$ To /home/camp/reskin/nbp.git
-bash: To: command not found
[fidelity_camp at tp6 pages]$ ! [rejected] master -> master
(non-fast forward)
-bash: syntax error near unexpected token `('
[fidelity_camp at tp6 pages]$ error: failed to push some refs to
'/home/camp/reskin/nbp.git'
-bash: error:: command not found
[fidelity_camp at tp6 pages]$ [fidelity_camp at tp6 pages]$
-bash: [fidelity_camp at tp6: command not found
[fidelity_camp at tp6 pages]$ git push
To /home/camp/reskin/nbp.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to '/home/camp/reskin/nbp.git'
[fidelity_camp at tp6 pages]$ git pull
remote: Counting objects: 253, done.
remote: Compressing objects: 100% (212/212), done.
remote: Total 233 (delta 130), reused 0 (delta 0)
Receiving objects: 100% (233/233), 19.94 MiB | 2373 KiB/s, done.
Resolving deltas: 100% (130/130), completed with 18 local
objects.
>From /home/camp/reskin/nbp
c279408..c6f4934 master -> origin/master
error: Entry 'catalogs/nbp/pages/homepage.html' not uptodate.
Cannot merge.
fatal: merging of trees eba9bdf174ca724b91bfe6977f00be450b5a2afa
and d3802e42978a78bc3de7f6a4c892a4b20fd81dec failed
[fidelity_camp at tp6 pages]$ git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 22 different commit(s) each, respectively.
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in
working directory)
#
# modified: homepage.html
# modified: index.html
# modified: ../../../htdocs/nbp/main_font.css
#
# Untracked files:
# (use "git add <file>..." to include in what will be
committed)
#
# index_new.html
# index_old.html
# index_template_test.html
# ../templates/regions/FOOT_P
# ../templates/regions/HEAD_P
# ../templates/regions/MENU_P
# ../templates/regions/STEVE_TEMPLATE
# ../templates/regions/TITLE
# ../templates/regions/TOP_P
no changes added to commit (use "git add" and/or "git commit
-a")
[fidelity_camp at tp6 pages]$ git push
To /home/camp/reskin/nbp.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to '/home/camp/reskin/nbp.git'
[fidelity_camp at tp6 pages]$
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.nbp.org/pipermail/web-reskin/attachments/20091105/02835844/attachment-0001.html
More information about the Web-reskin
mailing list