##// END OF EJS Templates
rollback: fix up tests
Matt Mackall -
r11175:39e7f14a default
parent child Browse files
Show More
@@ -71,7 +71,7 b' adding quux/file.py revisions'
71 files: 3/3 chunks (100.00%)
71 files: 3/3 chunks (100.00%)
72 added 3 changesets with 3 changes to 3 files
72 added 3 changesets with 3 changes to 3 files
73 updating the branch cache
73 updating the branch cache
74 rolling back to revision 1 (undo push)
74 rolling back to revision 0 (undo push)
75 0:6675d58eff77
75 0:6675d58eff77
76
76
77 Extension disabled for lack of acl.sources
77 Extension disabled for lack of acl.sources
@@ -143,7 +143,7 b' added 3 changesets with 3 changes to 3 f'
143 calling hook pretxnchangegroup.acl: hgext.acl.hook
143 calling hook pretxnchangegroup.acl: hgext.acl.hook
144 acl: changes have source "push" - skipping
144 acl: changes have source "push" - skipping
145 updating the branch cache
145 updating the branch cache
146 rolling back to revision 1 (undo push)
146 rolling back to revision 0 (undo push)
147 0:6675d58eff77
147 0:6675d58eff77
148
148
149 No [acl.allow]/[acl.deny]
149 No [acl.allow]/[acl.deny]
@@ -226,7 +226,7 b' acl: allowing changeset f9cafe1212c8'
226 acl: branch access granted: "911600dab2ae" on branch "default"
226 acl: branch access granted: "911600dab2ae" on branch "default"
227 acl: allowing changeset 911600dab2ae
227 acl: allowing changeset 911600dab2ae
228 updating the branch cache
228 updating the branch cache
229 rolling back to revision 1 (undo push)
229 rolling back to revision 0 (undo push)
230 0:6675d58eff77
230 0:6675d58eff77
231
231
232 Empty [acl.allow]
232 Empty [acl.allow]
@@ -832,7 +832,7 b' acl: allowing changeset f9cafe1212c8'
832 acl: branch access granted: "911600dab2ae" on branch "default"
832 acl: branch access granted: "911600dab2ae" on branch "default"
833 acl: allowing changeset 911600dab2ae
833 acl: allowing changeset 911600dab2ae
834 updating the branch cache
834 updating the branch cache
835 rolling back to revision 1 (undo push)
835 rolling back to revision 0 (undo push)
836 0:6675d58eff77
836 0:6675d58eff77
837
837
838 wilma can change files with a .txt extension
838 wilma can change files with a .txt extension
@@ -1208,7 +1208,7 b' acl: allowing changeset f9cafe1212c8'
1208 acl: branch access granted: "911600dab2ae" on branch "default"
1208 acl: branch access granted: "911600dab2ae" on branch "default"
1209 acl: allowing changeset 911600dab2ae
1209 acl: allowing changeset 911600dab2ae
1210 updating the branch cache
1210 updating the branch cache
1211 rolling back to revision 1 (undo push)
1211 rolling back to revision 0 (undo push)
1212 0:6675d58eff77
1212 0:6675d58eff77
1213
1213
1214 asterisk test
1214 asterisk test
@@ -1293,7 +1293,7 b' acl: allowing changeset f9cafe1212c8'
1293 acl: branch access granted: "911600dab2ae" on branch "default"
1293 acl: branch access granted: "911600dab2ae" on branch "default"
1294 acl: allowing changeset 911600dab2ae
1294 acl: allowing changeset 911600dab2ae
1295 updating the branch cache
1295 updating the branch cache
1296 rolling back to revision 1 (undo push)
1296 rolling back to revision 0 (undo push)
1297 0:6675d58eff77
1297 0:6675d58eff77
1298
1298
1299 no one is allowed inside foo/Bar/
1299 no one is allowed inside foo/Bar/
@@ -1465,7 +1465,7 b' acl: allowing changeset f9cafe1212c8'
1465 acl: branch access granted: "911600dab2ae" on branch "default"
1465 acl: branch access granted: "911600dab2ae" on branch "default"
1466 acl: allowing changeset 911600dab2ae
1466 acl: allowing changeset 911600dab2ae
1467 updating the branch cache
1467 updating the branch cache
1468 rolling back to revision 1 (undo push)
1468 rolling back to revision 0 (undo push)
1469 0:6675d58eff77
1469 0:6675d58eff77
1470
1470
1471 @group is allowed inside anything but foo/Bar/
1471 @group is allowed inside anything but foo/Bar/
@@ -62,7 +62,7 b' abort: cannot use --parent on non-merge '
62 # backout with valid parent should be ok
62 # backout with valid parent should be ok
63 removing d
63 removing d
64 changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
64 changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
65 rolling back to revision 5 (undo commit)
65 rolling back to revision 4 (undo commit)
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
67 removing c
67 removing c
68 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
68 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
@@ -154,7 +154,7 b' checking manifests'
154 crosschecking files in changesets and manifests
154 crosschecking files in changesets and manifests
155 checking files
155 checking files
156 4 files, 9 changesets, 7 total revisions
156 4 files, 9 changesets, 7 total revisions
157 rolling back to revision 5 (undo pull)
157 rolling back to revision 4 (undo pull)
158 % should fail
158 % should fail
159 abort: --base is incompatible with specifying a destination
159 abort: --base is incompatible with specifying a destination
160 abort: repository default-push not found!
160 abort: repository default-push not found!
@@ -187,7 +187,7 b' checking manifests'
187 crosschecking files in changesets and manifests
187 crosschecking files in changesets and manifests
188 checking files
188 checking files
189 4 files, 9 changesets, 7 total revisions
189 4 files, 9 changesets, 7 total revisions
190 rolling back to revision 3 (undo unbundle)
190 rolling back to revision 2 (undo unbundle)
191 % 2
191 % 2
192 2:d62976ca1e50
192 2:d62976ca1e50
193 adding changesets
193 adding changesets
@@ -202,7 +202,7 b' checking manifests'
202 crosschecking files in changesets and manifests
202 crosschecking files in changesets and manifests
203 checking files
203 checking files
204 2 files, 5 changesets, 5 total revisions
204 2 files, 5 changesets, 5 total revisions
205 rolling back to revision 3 (undo unbundle)
205 rolling back to revision 2 (undo unbundle)
206 adding changesets
206 adding changesets
207 adding manifests
207 adding manifests
208 adding file changes
208 adding file changes
@@ -215,7 +215,7 b' checking manifests'
215 crosschecking files in changesets and manifests
215 crosschecking files in changesets and manifests
216 checking files
216 checking files
217 3 files, 7 changesets, 6 total revisions
217 3 files, 7 changesets, 6 total revisions
218 rolling back to revision 3 (undo unbundle)
218 rolling back to revision 2 (undo unbundle)
219 adding changesets
219 adding changesets
220 adding manifests
220 adding manifests
221 adding file changes
221 adding file changes
@@ -37,7 +37,7 b' adding file changes'
37 added 9 changesets with 7 changes to 4 files (+1 heads)
37 added 9 changesets with 7 changes to 4 files (+1 heads)
38 (run 'hg heads' to see heads, 'hg merge' to merge)
38 (run 'hg heads' to see heads, 'hg merge' to merge)
39 ====== Rollback empty
39 ====== Rollback empty
40 rolling back to revision 0 (undo pull)
40 rolling back to revision -1 (undo pull)
41 ====== Pull full.hg into empty again (using --cwd)
41 ====== Pull full.hg into empty again (using --cwd)
42 pulling from ../full.hg
42 pulling from ../full.hg
43 requesting all changes
43 requesting all changes
@@ -55,7 +55,7 b' pulling from full.hg'
55 searching for changes
55 searching for changes
56 no changes found
56 no changes found
57 ====== Rollback empty
57 ====== Rollback empty
58 rolling back to revision 0 (undo pull)
58 rolling back to revision -1 (undo pull)
59 ====== Pull full.hg into empty again (using -R)
59 ====== Pull full.hg into empty again (using -R)
60 pulling from full.hg
60 pulling from full.hg
61 requesting all changes
61 requesting all changes
@@ -123,7 +123,7 b' adding file changes'
123 added 9 changesets with 7 changes to 4 files (+1 heads)
123 added 9 changesets with 7 changes to 4 files (+1 heads)
124 (run 'hg heads' to see heads, 'hg merge' to merge)
124 (run 'hg heads' to see heads, 'hg merge' to merge)
125 ====== Rollback empty
125 ====== Rollback empty
126 rolling back to revision 0 (undo pull)
126 rolling back to revision -1 (undo pull)
127 ====== Log -R bundle:empty+full.hg
127 ====== Log -R bundle:empty+full.hg
128 8 7 6 5 4 3 2 1 0
128 8 7 6 5 4 3 2 1 0
129 ====== Pull full.hg into empty again (using -R; with hook)
129 ====== Pull full.hg into empty again (using -R; with hook)
@@ -45,7 +45,7 b' converting...'
45 2 Initial revision
45 2 Initial revision
46 1 import
46 1 import
47 filtering out empty revision
47 filtering out empty revision
48 rolling back to revision 1 (undo commit)
48 rolling back to revision 0 (undo commit)
49 0 ci0
49 0 ci0
50 updating tags
50 updating tags
51 c
51 c
@@ -43,7 +43,7 b" examine changes to 'a'? [Ynsfdaq?]"
43 c
43 c
44 record this change to 'a'? [Ynsfdaq?]
44 record this change to 'a'? [Ynsfdaq?]
45
45
46 rolling back to revision 1 (undo commit)
46 rolling back to revision 0 (undo commit)
47 % qrecord
47 % qrecord
48 diff --git a/a b/a
48 diff --git a/a b/a
49 old mode 100644
49 old mode 100644
@@ -101,7 +101,7 b' adding manifests'
101 adding file changes
101 adding file changes
102 added 1 changesets with 1 changes to 1 files
102 added 1 changesets with 1 changes to 1 files
103 (run 'hg update' to get a working copy)
103 (run 'hg update' to get a working copy)
104 rolling back to revision 4 (undo pull)
104 rolling back to revision 3 (undo pull)
105 preoutgoing hook: HG_SOURCE=pull
105 preoutgoing hook: HG_SOURCE=pull
106 preoutgoing.forbid hook: HG_SOURCE=pull
106 preoutgoing.forbid hook: HG_SOURCE=pull
107 pulling from ../a
107 pulling from ../a
@@ -182,7 +182,7 b' parent: 0'
182 applying ../patch1
182 applying ../patch1
183 applying ../patch2
183 applying ../patch2
184 applied 1d4bd90af0e4
184 applied 1d4bd90af0e4
185 rolling back to revision 2 (undo commit)
185 rolling back to revision 1 (undo commit)
186 parent: 1
186 parent: 1
187 % hg import in a subdirectory
187 % hg import in a subdirectory
188 requesting all changes
188 requesting all changes
@@ -163,7 +163,7 b' diff -r d17e03c92c97 a'
163 do not process $Id:
163 do not process $Id:
164 xxx $
164 xxx $
165 +bar
165 +bar
166 rolling back to revision 3 (undo commit)
166 rolling back to revision 2 (undo commit)
167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
168 % init --mq
168 % init --mq
169 % qimport
169 % qimport
@@ -237,7 +237,7 b' diff -r ef63ca68695b c'
237 +do not process $Id:
237 +do not process $Id:
238 +xxx $
238 +xxx $
239 % rollback
239 % rollback
240 rolling back to revision 2 (undo commit)
240 rolling back to revision 1 (undo commit)
241 % status
241 % status
242 A c
242 A c
243 % update -C
243 % update -C
@@ -305,7 +305,7 b' committed changeset 3:d14c712653769de926'
305 % status
305 % status
306 ? c
306 ? c
307 % rollback
307 % rollback
308 rolling back to revision 3 (undo commit)
308 rolling back to revision 2 (undo commit)
309 % status
309 % status
310 R a
310 R a
311 ? c
311 ? c
@@ -347,7 +347,7 b' xxx $'
347 ignore $Id$
347 ignore $Id$
348
348
349 % rollback
349 % rollback
350 rolling back to revision 3 (undo commit)
350 rolling back to revision 2 (undo commit)
351 % clean update
351 % clean update
352 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
352 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
353 % kwexpand/kwshrink on selected files
353 % kwexpand/kwshrink on selected files
@@ -63,7 +63,7 b' foo'
63 default
63 default
64 bar
64 bar
65 % test for invalid branch cache
65 % test for invalid branch cache
66 rolling back to revision 5 (undo commit)
66 rolling back to revision 4 (undo commit)
67 changeset: 4:4909a3732169
67 changeset: 4:4909a3732169
68 branch: foo
68 branch: foo
69 tag: tip
69 tag: tip
@@ -95,10 +95,10 b' diff -r cb9a9f314b8b -r 0647d048b600 a'
95 +a
95 +a
96 (run 'hg update' to get a working copy)
96 (run 'hg update' to get a working copy)
97 % fail for config file is missing
97 % fail for config file is missing
98 rolling back to revision 1 (undo pull)
98 rolling back to revision 0 (undo pull)
99 pull failed
99 pull failed
100 % pull
100 % pull
101 rolling back to revision 1 (undo pull)
101 rolling back to revision 0 (undo pull)
102 pulling from ../a
102 pulling from ../a
103 searching for changes
103 searching for changes
104 adding changesets
104 adding changesets
@@ -129,7 +129,7 b' diff -r cb9a9f314b8b -r 0647d048b600 a'
129 +a
129 +a
130 (run 'hg update' to get a working copy)
130 (run 'hg update' to get a working copy)
131 % pull
131 % pull
132 rolling back to revision 1 (undo pull)
132 rolling back to revision 0 (undo pull)
133 pulling from ../a
133 pulling from ../a
134 searching for changes
134 searching for changes
135 adding changesets
135 adding changesets
@@ -19,7 +19,7 b' summary: add foo'
19 abort: unknown revision 'missing'!
19 abort: unknown revision 'missing'!
20 % pull multiple revisions with update
20 % pull multiple revisions with update
21 0:bbd179dfa0a7
21 0:bbd179dfa0a7
22 rolling back to revision 0 (undo pull)
22 rolling back to revision -1 (undo pull)
23 % pull -r 0
23 % pull -r 0
24 changeset: 0:bbd179dfa0a7
24 changeset: 0:bbd179dfa0a7
25 tag: tip
25 tag: tip
@@ -22,7 +22,7 b' 2ed2a3912a0b24502043eae84ee4b279c18b90dd'
22 pulling from http://foo:***@localhost:$HGPORT/
22 pulling from http://foo:***@localhost:$HGPORT/
23 searching for changes
23 searching for changes
24 no changes found
24 no changes found
25 rolling back to revision 0 (undo pull: http://foo:***@localhost:$HGPORT/)
25 rolling back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)
26 % issue 622
26 % issue 622
27 pulling from ../test
27 pulling from ../test
28 requesting all changes
28 requesting all changes
@@ -25,7 +25,7 b' remote: adding file changes'
25 remote: added 1 changesets with 1 changes to 1 files
25 remote: added 1 changesets with 1 changes to 1 files
26 % serve errors
26 % serve errors
27 changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http
27 changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http
28 rolling back to revision 1 (undo serve)
28 rolling back to revision 0 (undo serve)
29 % expect authorization error: all users denied
29 % expect authorization error: all users denied
30 abort: authorization failed
30 abort: authorization failed
31 pushing to http://localhost:$HGPORT/
31 pushing to http://localhost:$HGPORT/
@@ -34,7 +34,7 b' 2 files updated, 0 files merged, 0 files'
34 (branch merge, don't forget to commit)
34 (branch merge, don't forget to commit)
35 % commit issue 1476
35 % commit issue 1476
36 copies: c2 (c1)
36 copies: c2 (c1)
37 rolling back to revision 3 (undo commit)
37 rolling back to revision 2 (undo commit)
38 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
38 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
39 % merge heads again
39 % merge heads again
40 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
40 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -9,7 +9,7 b' user: test'
9 date: Mon Jan 12 13:46:40 1970 +0000
9 date: Mon Jan 12 13:46:40 1970 +0000
10 summary: test
10 summary: test
11
11
12 rolling back to revision 0 (undo commit)
12 rolling back to revision -1 (undo commit)
13 checking changesets
13 checking changesets
14 checking manifests
14 checking manifests
15 crosschecking files in changesets and manifests
15 crosschecking files in changesets and manifests
@@ -18,14 +18,14 b' 0 files, 0 changesets, 0 total revisions'
18 A a
18 A a
19 % Test issue 902
19 % Test issue 902
20 marked working directory as branch test
20 marked working directory as branch test
21 rolling back to revision 0 (undo commit)
21 rolling back to revision -1 (undo commit)
22 default
22 default
23 % Test issue 1635 (commit message saved)
23 % Test issue 1635 (commit message saved)
24 .hg/last-message.txt:
24 .hg/last-message.txt:
25 test2
25 test2
26 % Test rollback of hg before issue 902 was fixed
26 % Test rollback of hg before issue 902 was fixed
27 marked working directory as branch test
27 marked working directory as branch test
28 rolling back to revision 0 (undo commit)
28 rolling back to revision -1 (undo commit)
29 Named branch could not be reset, current branch still is: test
29 Named branch could not be reset, current branch still is: test
30 test
30 test
31 % rollback by pretxncommit saves commit message (issue 1635)
31 % rollback by pretxncommit saves commit message (issue 1635)
@@ -111,7 +111,7 b' date: Thu Jan 01 00:00:00 1970 +0'
111 summary: Removed tag bar
111 summary: Removed tag bar
112
112
113 % rollback undoes tag operation
113 % rollback undoes tag operation
114 rolling back to revision 5 (undo commit)
114 rolling back to revision 4 (undo commit)
115 tip 4:0c192d7d5e6b
115 tip 4:0c192d7d5e6b
116 bar 1:78391a272241
116 bar 1:78391a272241
117 tip 4:0c192d7d5e6b
117 tip 4:0c192d7d5e6b
@@ -75,7 +75,7 b' summary: add a'
75
75
76
76
77 % rolling back
77 % rolling back
78 rolling back to revision 2 (undo push)
78 rolling back to revision 1 (undo push)
79 % incoming
79 % incoming
80 2:faba9097cad4
80 2:faba9097cad4
81 % pull
81 % pull
@@ -104,7 +104,7 b' summary: add a'
104 % no new revs, no update
104 % no new revs, no update
105 0:1f0dee641bb7
105 0:1f0dee641bb7
106 % rollback
106 % rollback
107 rolling back to revision 2 (undo pull)
107 rolling back to revision 1 (undo pull)
108 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
108 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
109 0:1f0dee641bb7
109 0:1f0dee641bb7
110 % pull -u takes us back to branch foo
110 % pull -u takes us back to branch foo
@@ -116,7 +116,7 b' date: Thu Jan 01 00:00:00 1970 +0'
116 summary: new head of branch foo
116 summary: new head of branch foo
117
117
118 % rollback
118 % rollback
119 rolling back to revision 2 (undo pull)
119 rolling back to revision 1 (undo pull)
120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
121 % parents
121 % parents
122 0:1f0dee641bb7
122 0:1f0dee641bb7
General Comments 0
You need to be logged in to leave comments. Login now