Hi Mikhail, I'm trying to push the changes to hg but is getting the following message: ############ output ############## $ hg push ssh://h...@hg.services.openoffice.org/cws/removetooltypes01 Enter passphrase for key '/home/zxf/.ssh/id_dsa': pushing to ssh://h...@hg.services.openoffice.org/cws/removetooltypes01 searching for changes abort: push creates new remote branches! (did you forget to merge? use push -f to force) remote: OpenSSH_4.6p1, OpenSSL 0.9.8e 23 Feb 2007 remote: debug1: Connecting to hg.services.openoffice.org [12.184.192.15] port 22 . remote: debug1: Connection established. remote: debug1: identity file /home/zxf/.ssh/id_dsa type 2 remote: debug1: Remote protocol version 2.0, remote software version Sun_SSH_1.1
remote: debug1: no match: Sun_SSH_1.1 remote: debug1: Enabling compatibility mode for protocol 2.0 remote: debug1: Local version string SSH-2.0-OpenSSH_4.6 remote: debug1: SSH2_MSG_KEXINIT sent remote: debug1: SSH2_MSG_KEXINIT received remote: debug1: kex: server->client aes128-cbc hmac-md5 zlib remote: debug1: kex: client->server aes128-cbc hmac-md5 zlib remote: debug1: SSH2_MSG_KEX_DH_GEX_REQUEST(1024<1024<8192) sent remote: debug1: expecting SSH2_MSG_KEX_DH_GEX_GROUP remote: debug1: SSH2_MSG_KEX_DH_GEX_INIT sent remote: debug1: expecting SSH2_MSG_KEX_DH_GEX_REPLY remote: debug1: Host 'hg.services.openoffice.org' is known and matches the RSA h ost key. remote: debug1: Found key in /home/zxf/.ssh/known_hosts:3 remote: debug1: ssh_rsa_verify: signature correct remote: debug1: Enabling compression at level 6. remote: debug1: SSH2_MSG_NEWKEYS sent remote: debug1: expecting SSH2_MSG_NEWKEYS remote: debug1: SSH2_MSG_NEWKEYS received remote: debug1: SSH2_MSG_SERVICE_REQUEST sent remote: debug1: SSH2_MSG_SERVICE_ACCEPT received remote: debug1: Authentications that can continue: gssapi-keyex,gssapi-with-mic, publickey,password,keyboard-interactive remote: debug1: Next authentication method: publickey remote: debug1: Offering public key: /home/zxf/.ssh/id_dsa remote: debug1: Remote: Forced command: cd /zpool/hg/ooo/repositories && /usr/lo cal/bin/hg-ssh cws/* remote: debug1: Remote: Port forwarding disabled. remote: debug1: Remote: Agent forwarding disabled. remote: debug1: Remote: X11 forwarding disabled. remote: debug1: Remote: Pty allocation disabled. remote: debug1: Server accepts key: pkalg ssh-dss blen 433 remote: debug1: PEM_read_PrivateKey failed remote: debug1: read PEM private key done: type <unknown> remote: debug1: read PEM private key done: type DSA remote: debug1: Remote: Forced command: cd /zpool/hg/ooo/repositories && /usr/lo cal/bin/hg-ssh cws/* remote: debug1: Remote: Port forwarding disabled. remote: debug1: Remote: Agent forwarding disabled. remote: debug1: Remote: X11 forwarding disabled. remote: debug1: Remote: Pty allocation disabled. remote: debug1: Authentication succeeded (publickey). remote: debug1: channel 0: new [client-session] remote: debug1: Entering interactive session. remote: debug1: Sending command: hg -R cws/removetooltypes01 serve --stdio remote: debug1: client_input_channel_req: channel 0 rtype exit-status reply 0 remote: debug1: channel 0: free: client-session, nchannels 1 remote: debug1: Transferred: stdin 0, stdout 0, stderr 0 bytes in 11.4 seconds remote: debug1: Bytes per second: stdin 0.0, stdout 0.0, stderr 0.0 remote: debug1: Exit status 0 remote: debug1: compress outgoing: raw data 1304, compressed 709, factor 0.54 remote: debug1: compress incoming: raw data 1187, compressed 901, factor 0.76 ############ output ############## So I tried to merge the changeset and got: ############ output ############## $ hg pull http://hg.services.openoffice.org/cws/removetooltypes01 pulling from http://hg.services.openoffice.org/cws/removetooltypes01 searching for changes no changes found $ hg merge abort: outstanding uncommitted changes ############ output ############## I'm not sure if this is because I did hg commit locally *before* pushing the code, but it worked last time. May I have your advice please? Thanks very much in advance. Thanks and Best Regards, Felix.
