Show More
@@ -0,0 +1,19 b'' | |||
|
1 | #!/bin/sh | |
|
2 | # a test for issue586 | |
|
3 | ||
|
4 | hg init a | |
|
5 | cd a | |
|
6 | echo a > a | |
|
7 | hg ci -Ama | |
|
8 | ||
|
9 | hg init ../b | |
|
10 | cd ../b | |
|
11 | echo b > b | |
|
12 | hg ci -Amb | |
|
13 | ||
|
14 | hg pull -f ../a | |
|
15 | hg merge | |
|
16 | hg rm -f a | |
|
17 | hg ci -Amc | |
|
18 | ||
|
19 | hg st -A |
@@ -0,0 +1,13 b'' | |||
|
1 | adding a | |
|
2 | adding b | |
|
3 | pulling from ../a | |
|
4 | searching for changes | |
|
5 | warning: repository is unrelated | |
|
6 | adding changesets | |
|
7 | adding manifests | |
|
8 | adding file changes | |
|
9 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
10 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
|
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
12 | (branch merge, don't forget to commit) | |
|
13 | C b |
@@ -216,14 +216,10 b' def create_server(ui, repo):' | |||
|
216 | 216 | return hgwebobj |
|
217 | 217 | self.reqmaker = wsgiapplication(make_handler) |
|
218 | 218 | |
|
219 | addr, port = self.socket.getsockname()[:2] | |
|
220 |
if addr in (' |
|
|
219 | addr = address | |
|
220 | if addr in ('', '::'): | |
|
221 | 221 | addr = socket.gethostname() |
|
222 | else: | |
|
223 | try: | |
|
224 | addr = socket.gethostbyaddr(addr)[0] | |
|
225 | except socket.error: | |
|
226 | pass | |
|
222 | ||
|
227 | 223 | self.addr, self.port = addr, port |
|
228 | 224 | |
|
229 | 225 | class IPv6HTTPServer(MercurialHTTPServer): |
General Comments 0
You need to be logged in to leave comments.
Login now