Show More
@@ -112,6 +112,7 b' utestpats = [' | |||||
112 | (r'^ reverting .*/.*[^)]$', winglobmsg, '\$TESTTMP/unix-repo$'), |
|
112 | (r'^ reverting .*/.*[^)]$', winglobmsg, '\$TESTTMP/unix-repo$'), | |
113 | (r'^ cloning subrepo \S+/.*[^)]$', winglobmsg, '\$TESTTMP/unix-repo$'), |
|
113 | (r'^ cloning subrepo \S+/.*[^)]$', winglobmsg, '\$TESTTMP/unix-repo$'), | |
114 | (r'^ pushing to \$TESTTMP/.*[^)]$', winglobmsg, '\$TESTTMP/unix-repo$'), |
|
114 | (r'^ pushing to \$TESTTMP/.*[^)]$', winglobmsg, '\$TESTTMP/unix-repo$'), | |
|
115 | (r'^ moving \S+/.*[^)]$', winglobmsg), | |||
115 | (r'^ no changes made to subrepo since.*/.*[^)]$', |
|
116 | (r'^ no changes made to subrepo since.*/.*[^)]$', | |
116 | winglobmsg, '\$TESTTMP/unix-repo$'), |
|
117 | winglobmsg, '\$TESTTMP/unix-repo$'), | |
117 | (r'^ .*: largefile \S+ not available from file:.*/.*[^)]$', |
|
118 | (r'^ .*: largefile \S+ not available from file:.*/.*[^)]$', |
@@ -22,7 +22,7 b'' | |||||
22 | adding d/b |
|
22 | adding d/b | |
23 |
|
23 | |||
24 | $ hg mv d d-renamed |
|
24 | $ hg mv d d-renamed | |
25 | moving d/b to d-renamed/b |
|
25 | moving d/b to d-renamed/b (glob) | |
26 | $ hg ci -m 'rename B' |
|
26 | $ hg ci -m 'rename B' | |
27 |
|
27 | |||
28 | $ hg up -q -C 1 |
|
28 | $ hg up -q -C 1 |
@@ -51,7 +51,7 b'' | |||||
51 | getting b/b |
|
51 | getting b/b | |
52 | updating: b/b 4/5 files (80.00%) |
|
52 | updating: b/b 4/5 files (80.00%) | |
53 | updating: a/c 5/5 files (100.00%) |
|
53 | updating: a/c 5/5 files (100.00%) | |
54 | moving a/c to b/c |
|
54 | moving a/c to b/c (glob) | |
55 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
55 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
56 | (branch merge, don't forget to commit) |
|
56 | (branch merge, don't forget to commit) | |
57 |
|
57 |
General Comments 0
You need to be logged in to leave comments.
Login now