Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
Thomas Arendsen Hein
- Mon, 06 Aug 2007 18:31:15
Show More
tests/test-pull-update
0
created
755
+29
0
@@
-0,0
+1,29
b''
1
#!/bin/sh
2
#
3
4
hg init t
5
cd t
6
echo 1 > foo
7
hg ci -Am m
8
9
cd ..
10
hg clone t tt
11
cd tt
12
echo 1.1 > foo
13
hg ci -Am m
14
15
cd ../t
16
echo 1.2 > foo
17
hg ci -Am m
18
echo % should fail
19
hg pull -u ../tt
20
21
cd ../tt
22
echo % should fail
23
hg pull -u ../t
24
HGMERGE=true hg merge
25
hg ci -mm
26
27
cd ../t
28
echo % should work
29
hg pull -u ../tt
tests/test-pull-update.out
0
created
644
+31
0
@@
-0,0
+1,31
b''
1
adding foo
2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3
% should fail
4
pulling from ../tt
5
searching for changes
6
adding changesets
7
adding manifests
8
adding file changes
9
added 1 changesets with 1 changes to 1 files (+1 heads)
10
not updating, since new heads added
11
(run 'hg heads' to see heads, 'hg merge' to merge)
12
% should fail
13
pulling from ../t
14
searching for changes
15
adding changesets
16
adding manifests
17
adding file changes
18
added 1 changesets with 1 changes to 1 files (+1 heads)
19
not updating, since new heads added
20
(run 'hg heads' to see heads, 'hg merge' to merge)
21
merging foo
22
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
23
(branch merge, don't forget to commit)
24
% should work
25
pulling from ../tt
26
searching for changes
27
adding changesets
28
adding manifests
29
adding file changes
30
added 1 changesets with 1 changes to 1 files (-1 heads)
31
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
mercurial/commands.py
0
+1
-1
@@
-2012,7
+2012,7
b' def postincoming(ui, repo, modheads, opt'
2012
if modheads == 0 :
2012
if modheads == 0 :
2013
return
2013
return
2014
if optupdate :
2014
if optupdate :
2015
if modheads == 1 :
2015
if modheads < = 1 :
2016
return hg . update ( repo , None )
2016
return hg . update ( repo , None )
2017
else :
2017
else :
2018
ui . status ( _ ( "not updating, since new heads added \n " ))
2018
ui . status ( _ ( "not updating, since new heads added \n " ))
tests/run-tests.py
0
+2
0
@@
-227,6
+227,8
b' def run(cmd):'
227
ret = proc . wait ()
227
ret = proc . wait ()
228
if ret == 0 :
228
if ret == 0 :
229
ret = signal . SIGTERM << 8
229
ret = signal . SIGTERM << 8
230
output += ( " \n ### Abort: timeout after %d seconds. \n "
231
% options . timeout )
230
return ret , splitnewlines ( output )
232
return ret , splitnewlines ( output )
231
233
232
def run_one ( test ):
234
def run_one ( test ):
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