[Tux4kids-tuxtype-dev] Tux4kids-tuxtype-dev Digest, Vol 77, Issue 6

[Nalin.x.Linux]

ubuntu at ubuntu:~/t4kcommon$ git brach new
git: 'brach' is not a git command. See 'git --help'.

Did you mean this?
branch
ubuntu at ubuntu:~/t4kcommon$ git checkout accessibility
Switched to branch 'accessibility'
ubuntu at ubuntu:~/t4kcommon$

ubuntu at ubuntu:~/t4kcommon$ git branch new
ubuntu at ubuntu:~/t4kcommon$ git checkout new
Switched to branch 'new'
ubuntu at ubuntu:~/t4kcommon$ git log
commit 447bc11f39e54c224fbb91035e67be62af5b68d7
Author: nalin-x-linux-guest <nalin.x.linux at gmail.com>
Date:   Fri Nov 14 13:11:47 2014 +0530

    Text to speech interface added

commit 4c9040cff00e2c8ca39dc36da955fcf4b6eb8012
Author: Jerome Portal <jerome.portal.2 at gmail.com>
Date:   Wed May 15 18:54:23 2013 +0200

    t4k_common.h: remove duplicated DEBUGCODE and DEBUGMSG macros
definitions

commit d6f8759b02819bfd3830e96c79d7886cc6973749
Author: Jerome Portal <jerome.portal.2 at gmail.com>
Date:   Wed May 15 16:54:58 2013 +0200

    t4k_common.h: update START_CUSTOM_DEBUG

commit a9c84a16c6332800597f42f361de28d2f8dfb928
Author: Jerome Portal <jerome.portal.2 at gmail.com>
Date:   Fri Apr 26 20:50:44 2013 +0200
ubuntu at ubuntu:~/t4kcommon$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 1 commit.
ubuntu at ubuntu:~/t4kcommon$
ubuntu at ubuntu:~/t4kcommon$
ubuntu at ubuntu:~/t4kcommon$ git merge new
Already up-to-date.
ubuntu at ubuntu:~/t4kcommon$ git log
commit 447bc11f39e54c224fbb91035e67be62af5b68d7
Author: nalin-x-linux-guest <nalin.x.linux at gmail.com>
Date:   Fri Nov 14 13:11:47 2014 +0530

    Text to speech interface added

commit 4c9040cff00e2c8ca39dc36da955fcf4b6eb8012
Author: Jerome Portal <jerome.portal.2 at gmail.com>
Date:   Wed May 15 18:54:23 2013 +0200

    t4k_common.h: remove duplicated DEBUGCODE and DEBUGMSG macros
definitions

commit d6f8759b02819bfd3830e96c79d7886cc6973749
Author: Jerome Portal <jerome.portal.2 at gmail.com>
Date:   Wed May 15 16:54:58 2013 +0200

    t4k_common.h: update START_CUSTOM_DEBUG

commit a9c84a16c6332800597f42f361de28d2f8dfb928
Author: Jerome Portal <jerome.portal.2 at gmail.com>
Date:   Fri Apr 26 20:50:44 2013 +0200
ubuntu at ubuntu:~/t4kcommon$
ubuntu at ubuntu:~/t4kcommon$
ubuntu at ubuntu:~/t4kcommon$
ubuntu at ubuntu:~/t4kcommon$ git branch
  accessibility
* master
  new
ubuntu at ubuntu:~/t4kcommon$ git push origin master
Permission denied (publickey).
fatal: The remote end hung up unexpectedly
ubuntu at ubuntu:~/t4kcommon$ git push origin master
Permission denied (publickey).
fatal: The remote end hung up unexpectedly
ubuntu at ubuntu:~/t4kcommon$ git push origin master
Permission denied (publickey).
fatal: The remote end hung up unexpectedly
ubuntu at ubuntu:~/t4kcommon$






ubuntu at ubuntu:~/t4kcommon$ ssh -v git.debian.org
OpenSSH_5.9p1 Debian-5ubuntu1.1, OpenSSL 1.0.1 14 Mar 2012
debug1: Reading configuration data /etc/ssh/ssh_config
debug1: /etc/ssh/ssh_config line 19: Applying options for *

debug1: Connecting to git.debian.org [5.153.231.21] port 22.
debug1: Connection established.
debug1: identity file /home/ubuntu/.ssh/id_rsa type 1
debug1: Checking blacklist file /usr/share/ssh/blacklist.RSA-2048
debug1: Checking blacklist file /etc/ssh/blacklist.RSA-2048
debug1: identity file /home/ubuntu/.ssh/id_rsa-cert type -1
debug1: identity file /home/ubuntu/.ssh/id_dsa type -1
debug1: identity file /home/ubuntu/.ssh/id_dsa-cert type -1
debug1: identity file /home/ubuntu/.ssh/id_ecdsa type -1
debug1: identity file /home/ubuntu/.ssh/id_ecdsa-cert type -1
debug1: Remote protocol version 2.0, remote software version OpenSSH_6.0p1
Debian-4+deb7u2
debug1: match: OpenSSH_6.0p1 Debian-4+deb7u2 pat OpenSSH*
debug1: Enabling compatibility mode for protocol 2.0
debug1: Local version string SSH-2.0-OpenSSH_5.9p1 Debian-5ubuntu1.1
debug1: SSH2_MSG_KEXINIT sent
debug1: SSH2_MSG_KEXINIT received
debug1: kex: server->client aes128-ctr hmac-md5 none
debug1: kex: client->server aes128-ctr hmac-md5 none
debug1: sending SSH2_MSG_KEX_ECDH_INIT
debug1: expecting SSH2_MSG_KEX_ECDH_REPLY
debug1: Server host key: RSA d7:0b:26:5c:7a:5d:56:40:a9:e0:5d:f4:e1:70:88:bf
debug1: Host 'git.debian.org' is known and matches the RSA host key.
debug1: Found key in /home/ubuntu/.ssh/known_hosts:3
debug1: ssh_rsa_verify: signature correct
debug1: SSH2_MSG_NEWKEYS sent
debug1: expecting SSH2_MSG_NEWKEYS
debug1: SSH2_MSG_NEWKEYS received
debug1: Roaming not allowed by server
debug1: SSH2_MSG_SERVICE_REQUEST sent
debug1: SSH2_MSG_SERVICE_ACCEPT received
debug1: Authentications that can continue: publickey
debug1: Next authentication method: publickey
debug1: Offering RSA public key: /home/ubuntu/.ssh/id_rsa
debug1: Authentications that can continue: publickey
debug1: Trying private key: /home/ubuntu/.ssh/id_dsa
debug1: Trying private key: /home/ubuntu/.ssh/id_ecdsa
debug1: No more authentication methods to try.
Permission denied (publickey)


yup i waited 24 hours for cron in server to update but still also it's not
working! . So can anyone please do that merging process ?

expecting your response Nalin

-- 
*Free Software Free Society *
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/tux4kids-tuxtype-dev/attachments/20141127/f4c01bf7/attachment.html>