vbogoev: Quick tip: Ако eclipse реве "abort: crosses branches (use 'hg merge' or use 'hg update -c')." при pull, 1-во се commit-ва после се pull-ва и всичко е О.К. :)

Вход

Начало Потребители Групи

Следващ пост Профил на vbogoev Предишен пост

vbogoev

Quick tip: Ако eclipse реве "abort: crosses branches (use 'hg merge' or use 'hg update -c')." при pull, 1-во се commit-ва после се pull-ва и всичко е О.К.

May 22 2010, 15:54

Facebook

DB Queries: 10 (0.0051s) | CACHE Queries: 16 (0.0016s) | Script Execution Time: 0.010 | Memory usage: 0.84MB | Server Load Average: 0.04, 0.03, 0

0.00027	SELECT user_id FROM posts_mentioned WHERE post_id="652725" LIMIT 1
0.00046	SELECT * FROM posts WHERE id<"653963" AND user_id="10446" ORDER BY id DESC LIMIT 1
0.00026	SELECT id, type, data FROM posts_attachments WHERE post_id="655920" LIMIT 1
0.00065	SELECT * FROM posts WHERE id>"653963" AND user_id="10446" ORDER BY id ASC LIMIT 1
0.00041	SELECT id FROM groups WHERE is_public=0
0.00030	SELECT * FROM users_details WHERE user_id="10446" LIMIT 1
0.00029	SELECT * FROM users WHERE id="10446" LIMIT 1
0.00031	SELECT * FROM posts WHERE id="653963" LIMIT 1
0.00032	SELECT * FROM settings
0.00182	CONNECT 49.12.223.183:9906

0.00017	GET	f5dad\|1000\|n:1,userid:2928	object
0.00010	GET	f5dad\|1000\|n:1,group_invited_members:365	array
0.00007	GET	f5dad\|1000\|n:1,groupid:365	object
0.00007	GET	f5dad\|1000\|n:1,group_invited_members:358	array
0.00007	GET	f5dad\|1000\|n:1,groupid:358	object
0.00007	GET	f5dad\|1000\|n:1,group_invited_members:343	array
0.00008	GET	f5dad\|1000\|n:1,groupid:343	object
0.00008	GET	f5dad\|1000\|n:1,group_invited_members:240	array
0.00009	GET	f5dad\|1000\|n:1,groupid:240	object
0.00009	GET	f5dad\|1000\|n:1,group_invited_members:221	array
0.00013	GET	f5dad\|1000\|n:1,groupid:221	object
0.00011	GET	f5dad\|1000\|n:1,group_invited_members:132	array
0.00012	GET	f5dad\|1000\|n:1,groupid:132	object
0.00011	SET	f5dad\|1000\|n:1,userid:10446	TRUE
0.00027	GET	f5dad\|1000\|n:1,userid:10446	FALSE
0.00002	CONNECT	172.20.0.6:11211	TRUE