bzr freezes when I try to merge.

Asked by enkhbatd

Hello!

I'm began using bazaar recently. When I try merge my committed branch to sftp server bazaar freezes. Here log from .bzr.log:

...
0.655 opening working tree 'D:/Interesting/orgchat/trunk'
2.417 falling back to default implementation
2.417 failed to load system host keys: [Errno 2] No such file or directory: 'C:\\Documents and Settings\\username/.ssh/known_hosts'
[ 2264] 2009-11-12 11:39:27.970 INFO: Connected (version 2.0, client OpenSSH_5.3)
2.916 Unable to look up default port for ssh
[ 2264] 2009-11-12 11:39:33.617 INFO: Authentication (password) successful!
[ 2264] 2009-11-12 11:39:33.631 INFO: Secsh channel 1 opened.
[ 2264] 2009-11-12 11:39:33.664 INFO: [chan 1] Opened sftp connection (server version 3)

My guess is error is related to 3rd row information. So what shall I do?

Thanks.

P.S: I'm using bzr-2.0.2-1.

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
enkhbatd (enkhbatd) said :
#1

Also I'm using windows XP. Is this window XP related bug or different issue?

Revision history for this message
Martin Pool (mbp) said :
#2

Hi

Can you try

SET BZR_SSH=paramiko

and see if that works better?

Revision history for this message
enkhbatd (enkhbatd) said :
#3

I executed that command in windows cmd.

But it made no difference.

Revision history for this message
Alexander Belchenko (bialix) said :
#4

What it means: "When I try merge my committed branch to sftp server"

Revision history for this message
enkhbatd (enkhbatd) said :
#5

Excuse me for my bad English. It means: First I do branch and get a copy of it, then I change something and do commit. Next I try to do merge my changes to sftp server.

Revision history for this message
Alexander Belchenko (bialix) said :
#6

enkhbatd пишет:
> Question #89799 on Bazaar changed:
> https://answers.launchpad.net/bzr/+question/89799
>
> Status: Needs information => Open
>
> enkhbatd gave more information on the question:
> Excuse me for my bad English. It means: First I do branch and get a copy
> of it, then I change something and do commit. Next I try to do merge my
> changes to sftp server.
>

You can't merge your changes *to* sftp server. Can you show actual
command line you try to execute? You can mangle actual URLs if needed, I
just need to see what you trying to do by bzr.

Revision history for this message
enkhbatd (enkhbatd) said :
#7

I'm using graphic interface or Bazaar Explorer. Here is picture of this command: http://farm3.static.flickr.com/2537/4097165633_1f697e41db_o.jpg

Revision history for this message
Alexander Belchenko (bialix) said :
#8

enkhbatd пишет:
> Question #89799 on Bazaar changed:
> https://answers.launchpad.net/bzr/+question/89799
>
> Status: Answered => Open
>
> enkhbatd is still having a problem:
> I'm using graphic interface or Bazaar Explorer. Here is picture of this
> command: http://farm3.static.flickr.com/2537/4097165633_1f697e41db_o.jpg

OK, I see now.

You're trying to merge *from* sftp server to your local branch named
"trunk" in shared repo "orgchat". Looking at your log it seems the GUI
has asked you a password for sftp access, right?

Can you try following:

Select menu Tools -> Advanced Commands...
It will start shell session in the black console behind main GUI window.
Switch to that console and issue the command:

bzr merge sftp://xxx/~/orgchat

And see if this command will ask you more questions then just password.
If it stuck again, can you show me that console session and
corresponding part of .bzr.log again, please?

Revision history for this message
enkhbatd (enkhbatd) said :
#9

I've done it according to your advice. Here is log:

Thu 2009-11-12 17:23:53 +0800
0.172 bzr arguments: [u'merge', u'sftp://xxx/~/orgchat']
0.187 looking for plugins in C:/Documents and Settings/username/Application Data/bazaar/2.0/plugins
0.187 looking for plugins in C:/Program Files/Bazaar/plugins
0.594 opening working tree 'D:/Interesting/orgchat/trunk'
2.515 falling back to default implementation
2.515 failed to load system host keys: [Errno 2] No such file or directory: 'C:\\Documents and Settings\\username/.ssh/known_hosts'
[ 2700] 2009-11-12 17:23:56.391 INFO: Connected (version 2.0, client OpenSSH_5.3)
3.047 Unable to look up default port for ssh
3.047 encoding stdout as sys.stdout encoding 'cp437'
[ 2700] 2009-11-12 17:24:06.578 INFO: Authentication (password) successful!
[ 2700] 2009-11-12 17:24:06.594 INFO: Secsh channel 1 opened.
[ 2700] 2009-11-12 17:24:06.625 INFO: [chan 1] Opened sftp connection (server version 3)

Revision history for this message
Alexander Belchenko (bialix) said :
#10

enkhbatd пишет:
> Question #89799 on Bazaar changed:
> https://answers.launchpad.net/bzr/+question/89799
>
> Status: Answered => Open
>
> enkhbatd is still having a problem:
> I've done it according to your advice. Here is log:

Can I see console session as well? Righ click on the console with mouse,
select Mark, then select the text with left button pressed and press
Enter. Then Ctrl+C this text to e-mail.

Revision history for this message
enkhbatd (enkhbatd) said :
#11

Here is console session:

Thu 2009-11-12 17:23:53 +0800
0.172 bzr arguments: [u'merge', u'sftp://xxx/~/orgchat']
0.187 looking for plugins in C:/Documents and Settings/username/Application Data/bazaar/2.0/plugins
0.187 looking for plugins in C:/Program Files/Bazaar/plugins
0.594 opening working tree 'D:/Interesting/orgchat/trunk'
2.515 falling back to default implementation
2.515 failed to load system host keys: [Errno 2] No such file or directory: 'C:\\Documents and Settings\\username/.ssh/known_hosts'
[ 2700] 2009-11-12 17:23:56.391 INFO: Connected (version 2.0, client OpenSSH_5.3)
3.047 Unable to look up default port for ssh
3.047 encoding stdout as sys.stdout encoding 'cp437'
[ 2700] 2009-11-12 17:24:06.578 INFO: Authentication (password) successful!
[ 2700] 2009-11-12 17:24:06.594 INFO: Secsh channel 1 opened.
[ 2700] 2009-11-12 17:24:06.625 INFO: [chan 1] Opened sftp connection (server version 3)

Revision history for this message
Alexander Belchenko (bialix) said :
#12

enkhbatd пишет:
> Question #89799 on Bazaar changed:
> https://answers.launchpad.net/bzr/+question/89799
>
> Status: Answered => Open
>
> enkhbatd is still having a problem:
> Here is console session:
>
> Thu 2009-11-12 17:23:53 +0800
> 0.172 bzr arguments: [u'merge', u'sftp://xxx/~/orgchat']

No, I mean the text in the shell console itself when you ran command.
Not the content of .bzr.log.

Revision history for this message
Alexander Belchenko (bialix) said :
#13

enkhbatd пишет:
> Question #89799 on Bazaar changed:
> https://answers.launchpad.net/bzr/+question/89799
>
> Status: Answered => Open
>
> enkhbatd is still having a problem:
> Here is console session:
>
> Thu 2009-11-12 17:23:53 +0800
> 0.172 bzr arguments: [u'merge', u'sftp://xxx/~/orgchat']

Can you check that your name on your local machine and account on remote
server is the same?

Can you try to run merge command with fully qualified path to the
branch, e.g. instead ~ use your account name?

Can you check that orgchat directory on the server is actually branch
(and not the shared repository)?

Can you check that you actually can connect to your server using Putty?

Revision history for this message
enkhbatd (enkhbatd) said :
#14

Sorry. :D Here it's:

D:\Interesting\orgchat\trunk>bzr merge sftp://xxx/~/orgchat
Connected (version 2.0, client OpenSSH_5.3)
SSH xxx password:
Authentication (password) successful!
Secsh channel 1 opened.
[chan 1] Opened sftp connection (server version 3)

Revision history for this message
enkhbatd (enkhbatd) said :
#15

I'm using IP address to connect, so it's same.

I'll try it. But will it be different?

I can get it using branch command. So it's definitely branch.

Yes, I successfully connected using putty as connection type ssh.

Revision history for this message
Alexander Belchenko (bialix) said :
#16

enkhbatd пишет:
> Question #89799 on Bazaar changed:
> https://answers.launchpad.net/bzr/+question/89799
>
> enkhbatd gave more information on the question:
> I'm using IP address to connect, so it's same.
>
> I'll try it. But will it be different?
>
> I can get it using branch command. So it's definitely branch.

So you say that `bzr branch sftp://xxx/~/orgchat` command is working,
but merge from the same URL does not work?

Can you try following:

bzr branch sftp://xxx/~orgchat trunk-mirror

then merge from local trunk-mirror branch to your trunk. Will it work
with Bazaar Explorer?

After merge you may want to publish merged branch with Push command
(either in Bazaar Explorer or in command line). If you will push can you
say us is push succeed?

Revision history for this message
enkhbatd (enkhbatd) said :
#17

Additional information: branch and push is working okay, but pull and merge is freezing in explorer mode.

Revision history for this message
Alexander Belchenko (bialix) said :
#18

enkhbatd пишет:
> Question #89799 on Bazaar changed:
> https://answers.launchpad.net/bzr/+question/89799
>
> Status: Answered => Open
>
> enkhbatd is still having a problem:
> Additional information: branch and push is working okay, but pull and
> merge is freezing in explorer mode.

File a bug against bzr itself.

Add my following comment: "bialix said: I suspect it's related to check
if the URL is merge directive"

I'm give up here. Sorry.

Revision history for this message
enkhbatd (enkhbatd) said :
#19

I wanna thank you for your effort, Okay I will file as a bug.

Can you help with this problem?

Provide an answer of your own, or ask enkhbatd for more information if necessary.

To post a message you must log in.