Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
Brendan Cully
- Mon, 11 Jun 2007 04:05:01
Show More
tests/test-586
0
created
755
+19
0
@@
-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
tests/test-586.out
0
created
644
+13
0
@@
-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
mercurial/hgweb/server.py
0
+3
-7
@@
-216,14
+216,10
b' def create_server(ui, repo):'
216
return hgwebobj
216
return hgwebobj
217
self . reqmaker = wsgiapplication ( make_handler )
217
self . reqmaker = wsgiapplication ( make_handler )
218
218
219
addr , port = self . socket . getsockname ()[: 2 ]
219
addr = address
220
if addr in ( '0.0.0.0' , '::' ):
220
if addr in ( '' , '::' ):
221
addr = socket . gethostname ()
221
addr = socket . gethostname ()
222
else :
222
223
try :
224
addr = socket . gethostbyaddr ( addr )[ 0 ]
225
except socket . error :
226
pass
227
self . addr , self . port = addr , port
223
self . addr , self . port = addr , port
228
224
229
class IPv6HTTPServer ( MercurialHTTPServer ):
225
class IPv6HTTPServer ( MercurialHTTPServer ):
mercurial/localrepo.py
0
+2
0
@@
-810,6
+810,8
b' class localrepository(repo.repository):'
810
if f in m1 :
810
if f in m1 :
811
del m1 [ f ]
811
del m1 [ f ]
812
removed . append ( f )
812
removed . append ( f )
813
elif f in m2 :
814
removed . append ( f )
813
mn = self . manifest . add ( m1 , tr , linkrev , c1 [ 0 ], c2 [ 0 ], ( new , removed ))
815
mn = self . manifest . add ( m1 , tr , linkrev , c1 [ 0 ], c2 [ 0 ], ( new , removed ))
814
816
815
# add changeset
817
# add changeset
Site-wide shortcuts
/
Use quick search box
g h
Goto home page
g g
Goto my private gists page
g G
Goto my public gists page
g 0-9
Goto bookmarked items from 0-9
n r
New repository page
n g
New gist page
Repositories
g s
Goto summary page
g c
Goto changelog page
g f
Goto files page
g F
Goto files page with file search activated
g p
Goto pull requests page
g o
Goto repository settings
g O
Goto repository access permissions settings
t s
Toggle sidebar on some pages