Locking Design and Branch Merge

[marschant]

hello everyone!

i am using mercurial.I want to write a manager tools,but now i have two
problems, i hope you can help me.

1. how to know .hg/wlock or .hg/store/lock is useless file，i can del
them.(how to know be sure no actual processes are running). because if
always have "waiting for lock on .." error ,i must login server and del
them。

2. i want to merge branch from other branch that pull from this branch. for
example:

repo A,B. B colne from A. B have branches "default","n","m". A have
branches "default","n".  how to pull B's branch "m" to A's branch
"defalut", and  just repo A's branch "default" change log changed, repo A's
other branch no change.

Thank you for any answers。
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20131118/4d9c1143/attachment.html>