Skip to content

Instantly share code, notes, and snippets.

@mcondarelli

mcondarelli/gist:c16f3400003123f011902821bbb480c3

Created November 4, 2016 12:48
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mcondarelli/c16f3400003123f011902821bbb480c3 to your computer and use it in GitHub Desktop.
Save mcondarelli/c16f3400003123f011902821bbb480c3 to your computer and use it in GitHub Desktop.
Download ZIP
Committer side
Raw
gistfile1.txt
COMMITTER SIDE
See below for integrator side.
================================================================
mcon@e2sid:~/emotiq/Buildroot$ git pull
remote: Counting objects: 99, done.
remote: Compressing objects: 100% (96/96), done.
remote: Total 99 (delta 75), reused 0 (delta 0)
Unpacking objects: 100% (99/99), done.
From http://.../Buildroot
bf6911c..beccec4 master -> origin/master
Auto-merging output/.config
Auto-merging input/overlay/root/ztone-netstatus
CONFLICT (content): Merge conflict in input/overlay/root/ztone-netstatus
Auto-merging input/configs/ariag25_defconfig
Removing 27-Refresh_web_site
Automatic merge failed; fix conflicts and then commit the result.
mcon@e2sid:~/emotiq/Buildroot$ mcedit input/overlay/root/ztone-netstatus
KiTTY X11 proxy: unable to connect to forwarded X server: Network error: Connection refused
mcon@e2sid:~/emotiq/Buildroot$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 14 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
new file: 27-Refresh-website
deleted: 27-Refresh_web_site
modified: input/configs/ariag25_defconfig
modified: input/overlay/etc/init.d/rc.local
modified: input/overlay/root/configure_network_dhcp
modified: input/overlay/root/configure_network_static
modified: input/overlay/root/setup_mail
modified: input/overlay/root/sftpuser-add
modified: input/overlay/root/sftpuser-chpwd
modified: input/overlay/root/sftpuser-del
modified: input/overlay/root/sftpuser-list
modified: input/overlay/root/ztone-join
modified: input/overlay/root/ztone-leave
modified: input/package/emotiq/emotiq.mk
modified: input/package/emotiqweb/Config.in
modified: input/package/emotiqweb/emotiqweb.mk
modified: output/.config
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: input/overlay/root/ztone-netstatus
Untracked files:
(use "git add <file>..." to include in what will be committed)
patches/
mcon@e2sid:~/emotiq/Buildroot$ git add input/overlay/root/ztone-netstatus
mcon@e2sid:~/emotiq/Buildroot$ rm -r patches/
mcon@e2sid:~/emotiq/Buildroot$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 14 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
Changes to be committed:
new file: 27-Refresh-website
deleted: 27-Refresh_web_site
modified: input/configs/ariag25_defconfig
modified: input/overlay/etc/init.d/rc.local
modified: input/overlay/root/configure_network_dhcp
modified: input/overlay/root/configure_network_static
modified: input/overlay/root/setup_mail
modified: input/overlay/root/sftpuser-add
modified: input/overlay/root/sftpuser-chpwd
modified: input/overlay/root/sftpuser-del
modified: input/overlay/root/sftpuser-list
modified: input/overlay/root/ztone-join
modified: input/overlay/root/ztone-leave
modified: input/overlay/root/ztone-netstatus
modified: input/package/emotiq/emotiq.mk
modified: input/package/emotiqweb/Config.in
modified: input/package/emotiqweb/emotiqweb.mk
modified: output/.config
mcon@e2sid:~/emotiq/Buildroot$ git commit
[master 6fdca7c] Merge branch 'master' of http://.../Buildroot
mcon@e2sid:~/emotiq/Buildroot$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
mcon@e2sid:~/emotiq/Buildroot$
mcon@e2sid:~/emotiq/at91bootstrap$ git pull
remote: Counting objects: 7, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 7 (delta 6), reused 0 (delta 0)
Unpacking objects: 100% (7/7), done.
From http://.../at91bootstrap
9875d3c..0fc92c4 emotiq -> origin/emotiq
Updating 9875d3c..0fc92c4
Fast-forward
board/board_cpp.mk | 6 +++---
driver/Config.in.driver | 2 +-
emotiq.c | 8 +-------
3 files changed, 5 insertions(+), 11 deletions(-)
mcon@e2sid:~/emotiq/at91bootstrap$
mcon@e2sid:~/emotiq/workarm$ git pull
remote: Counting objects: 119, done.
remote: Compressing objects: 100% (119/119), done.
remote: Total 119 (delta 82), reused 0 (delta 0)
Receiving objects: 100% (119/119), 22.45 KiB | 0 bytes/s, done.
Resolving deltas: 100% (82/82), completed with 45 local objects.
From http://.../workarm
e55aa91..63e0b66 master -> origin/master
Merge made by the 'recursive' strategy.
DB/CreateDb_Pc | 6 +-
DB/UpdDb | 4 +-
DB/data-0010.sql | 584 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DB/journal-0001.sql | 79 +++++++++
ServerIo/ServerIoPc | Bin 25840 -> 25840 bytes
ServerIo/fastio.cpp | 5 +-
Work.pro | 4 +-
cassieri.cpp | 16 +-
clienti.cpp | 16 +-
config.cpp | 10 +-
crc32.cpp | 48 +++++
crc32.h | 11 ++
datifiscali.cpp | 12 +-
define.h | 2 +-
ecr.cpp | 28 ++-
emotiq.mk | 2 +
error.h | 4 +-
gruppi.cpp | 2 +-
journal.cpp | 19 ++
journal.h | 1 +
messaggi.cpp | 2 +-
mf.cpp | 2 +-
modificatori.cpp | 4 +-
pagamenti.cpp | 12 +-
parsexon.cpp | 7 +-
plu.cpp | 8 +-
prevendita.cpp | 18 +-
prevendita.h | 1 +
reparti.cpp | 4 +-
scontrino.cpp | 41 ++---
serverio.h | 6 +-
sqlitedb.cpp | 34 +++-
sqlitedb.h | 1 +
sqlitequery.cpp | 11 +-
sqlitequery.h | 1 +
ticket.cpp | 2 +-
vendita.cpp | 3 +-
web/api-0.5/EmotiqP.yaml | 152 +++++++++++++++-
web/api-0.5/frontend/dateGet.php | 5 +-
web/api-0.5/frontend/datetimeSet.php | 15 +-
web/api-0.5/frontend/enableEthernetDHCP.php | 8 +-
web/api-0.5/frontend/enableEthernetStatic.php | 21 ++-
web/api-0.5/frontend/modifierGet.php | 2 +-
web/api-0.5/frontend/modifierGetAll.php | 14 +-
web/api-0.5/frontend/modifierPost.php | 4 +-
web/api-0.5/frontend/modifierPut.php | 4 +-
web/api-0.5/frontend/remoteAssistanceJoin.php | 4 +-
web/api-0.5/frontend/remoteAssistanceLeave.php | 4 +-
web/api-0.5/frontend/remoteAssistanceMyId.php | 3 +-
web/api-0.5/frontend/remoteAssistanceNetStatus.php | 3 +-
web/api-0.5/frontend/remoteAssistanceRestart.php | 3 +-
web/api-0.5/frontend/remoteAssistanceStart.php | 3 +-
web/api-0.5/frontend/remoteAssistanceStop.php | 3 +-
web/api-0.5/frontend/timeGet.php | 5 +-
web/api-0.5/frontend/wifiAPStart.php | 7 +
web/api-0.5/frontend/wifiAPStop.php | 7 +
web/api-0.5/frontend/wifiSetAP.php | 7 +
web/api-0.5/frontend/wifiSetAPDHCPSrv.php | 7 +
web/api-0.5/frontend/wifiSetDHCP.php | 7 +
web/api-0.5/frontend/wifiSetStatic.php | 7 +
web/api-0.5/frontend/wifiStart.php | 7 +
web/api-0.5/frontend/wifiStop.php | 6 +
62 files changed, 1199 insertions(+), 119 deletions(-)
create mode 100644 DB/data-0010.sql
create mode 100644 DB/journal-0001.sql
create mode 100644 crc32.cpp
create mode 100644 crc32.h
mode change 100644 => 100755 web/api-0.5/EmotiqP.yaml
mode change 100644 => 100755 web/api-0.5/frontend/modifierGet.php
mode change 100644 => 100755 web/api-0.5/frontend/modifierGetAll.php
mode change 100644 => 100755 web/api-0.5/frontend/modifierPost.php
mode change 100644 => 100755 web/api-0.5/frontend/modifierPut.php
create mode 100644 web/api-0.5/frontend/wifiAPStart.php
create mode 100644 web/api-0.5/frontend/wifiAPStop.php
create mode 100644 web/api-0.5/frontend/wifiSetAP.php
create mode 100644 web/api-0.5/frontend/wifiSetAPDHCPSrv.php
create mode 100644 web/api-0.5/frontend/wifiSetDHCP.php
create mode 100644 web/api-0.5/frontend/wifiSetStatic.php
create mode 100644 web/api-0.5/frontend/wifiStart.php
create mode 100644 web/api-0.5/frontend/wifiStop.php
mcon@e2sid:~/emotiq/workarm$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
mcon@e2sid:~/emotiq/workarm$ git format-patch -o ../patch -M origin/master
../patch/0001-Rimossi-alcuni-file-generati.patch
mcon@e2sid:~/emotiq/workarm$
mcon@e2sid:~/emotiq/Buildroot$ git format-patch -o ../patch -M origin/master
../patch/0001-Some-trivial-fixes.patch
mcon@e2sid:~/emotiq/Buildroot$ git send-email --to ... ../patch/*.patch
../patch/0001-Rimossi-alcuni-file-generati.patch
../patch/0001-Some-trivial-fixes.patch
OK. Log says:
Server: ...
MAIL FROM:<...>
RCPT TO:<...>
From: Mauro <...>
To: ...
Subject: [PATCH] Rimossi alcuni file generati.
Date: Fri, 4 Nov 2016 12:03:28 +0100
Message-Id: <...>
X-Mailer: git-send-email 2.10.1
Result: 250
(mbox) Adding cc: Mauro <...> from line 'From: Mauro <...>'
OK. Log says:
Server: ...
MAIL FROM:<...>
RCPT TO:<...>
RCPT TO:<...>
From: Mauro <...>
To: ...
Cc: Mauro <...>
Subject: [PATCH] Some trivial fixes.
Date: Fri, 4 Nov 2016 12:03:29 +0100
Message-Id: <...>
X-Mailer: git-send-email 2.10.1
In-Reply-To: <...>
References: <...>
Result: 250
mcon@e2sid:~/emotiq/Buildroot$
mcon@e2sid:~/emotiq/workarm$ git pull
remote: Counting objects: 7, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 7 (delta 5), reused 0 (delta 0)
Unpacking objects: 100% (7/7), done.
From http://.../workarm
63e0b66..29b7c45 master -> origin/master
Merge made by the 'recursive' strategy.
mcon@e2sid:~/emotiq/workarm$ git status
On branch master
Your branch is ahead of 'origin/master' by 3 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
mcon@e2sid:~/emotiq/workarm$ git diff origin/master
mcon@e2sid:~/emotiq/workarm$ git log
commit b4fbe837fc77b6052c9e675be8bd81291d33fa10
Merge: 1d5810f 29b7c45
Author: Mauro Condarelli <...>
Date: Fri Nov 4 13:08:30 2016 +0100
Merge branch 'master' of http://.../workarm
commit 29b7c4502e3539c96711779c08a38ebcaa23dfb8
Merge: 4185264 63e0b66
Author: Gianluca <...>
Date: Fri Nov 4 12:44:55 2016 +0100
Merge branch 'master' of http://.../workarm
commit 41852641a225a2b4e8110901a1e00a78890344f0
Author: Mauro <...>
Date: Fri Nov 4 12:03:28 2016 +0100
Rimossi alcuni file generati.
commit 1d5810f7a7869db51f8375475f4b58697fafe6db
Merge: d15088c 63e0b66
Author: Mauro <...>
Date: Fri Nov 4 11:59:52 2016 +0100
Merge branch 'master' of http://.../workarm
commit 63e0b663cd003b6b27d8a7066309ce8d6adf2ba5
Author: Valeria <...>
Date: Thu Nov 3 18:05:40 2016 +0100
Eliminate stampe debug per registri backup
commit ed9c55b71731aa151387d41dfa59918951b47776
Author: Valeria <...>
Date: Thu Nov 3 15:18:32 2016 +0100
mcon@e2sid:~/emotiq/workarm$ git status
On branch master
Your branch is ahead of 'origin/master' by 3 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
mcon@e2sid:~/emotiq/workarm$ git send-email
================================================================
INTEGRATOR SIDE:
(This transcript does *not* match the above, the matching one is
lost.
This is another try with another committer, but the commands
issued were the same)
================================================================
gianluca@gianlucadeb:~/MyProject/Buildroot$ git am ../patch/0001-modificato-script-root-ztone-netstatus.patch
Applying: modificato script /root/ztone-netstatus
gianluca@gianlucadeb:~/MyProject/Buildroot$ git push
Counting objects: 6, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 567 bytes | 0 bytes/s, done.
Total 6 (delta 5), reused 0 (delta 0)
To http://gianluca@git.okcash.com/Buildroot.git
beccec4..a5fac5a master -> master
================================================================
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment