Show More
@@ -78,5 +78,5 b' attack /tmp/test' | |||
|
78 | 78 | $ hg manifest -r4 |
|
79 | 79 | /tmp/test |
|
80 | 80 | $ hg update -Cr4 |
|
81 |
abort: No such file or directory: |
|
|
81 | abort: No such file or directory: $TESTTMP/target//tmp/test | |
|
82 | 82 | [255] |
@@ -8,7 +8,7 b'' | |||
|
8 | 8 | $ echo "badext2 =" >> $HGRCPATH |
|
9 | 9 | |
|
10 | 10 | $ hg -q help help |
|
11 |
|
|
|
11 | *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow | |
|
12 | 12 | *** failed to import extension badext2: No module named badext2 |
|
13 | 13 | hg help [TOPIC] |
|
14 | 14 |
@@ -37,7 +37,7 b' bookmark list' | |||
|
37 | 37 | rebase |
|
38 | 38 | |
|
39 | 39 | $ hg rebase -s two -d one |
|
40 | saved backup bundle to * (glob) | |
|
40 | saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob) | |
|
41 | 41 | |
|
42 | 42 | $ hg log |
|
43 | 43 | changeset: 3:9163974d1cb5 |
@@ -50,7 +50,7 b' bookmarks updated?' | |||
|
50 | 50 | strip to revision 1 |
|
51 | 51 | |
|
52 | 52 | $ hg strip 1 |
|
53 | saved backup bundle to * (glob) | |
|
53 | saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob) | |
|
54 | 54 | |
|
55 | 55 | list bookmarks |
|
56 | 56 |
@@ -80,7 +80,7 b' Check that path aliases are expanded:' | |||
|
80 | 80 | |
|
81 | 81 | $ hg clone -q -U --config 'paths.foobar=a#0' foobar f |
|
82 | 82 | $ hg -R f showconfig paths.default |
|
83 | */a#0 (glob) | |
|
83 | $TESTTMP/a#0 | |
|
84 | 84 | |
|
85 | 85 | Use --pull: |
|
86 | 86 |
@@ -62,7 +62,7 b' Convert' | |||
|
62 | 62 | $ hg convert src |
|
63 | 63 | assuming destination src-hg |
|
64 | 64 | initializing destination src-hg repository |
|
65 |
connecting to |
|
|
65 | connecting to $TESTTMP/cvsrepo | |
|
66 | 66 | scanning source... |
|
67 | 67 | collecting CVS rlog |
|
68 | 68 | 7 log entries |
@@ -69,7 +69,7 b' make unrelated change on v1_1' | |||
|
69 | 69 | merge file1 to v1_1 |
|
70 | 70 | |
|
71 | 71 | $ cvscall -Q update -jv1_0 |
|
72 |
RCS file: |
|
|
72 | RCS file: $TESTTMP/cvsrepo/proj/file1,v | |
|
73 | 73 | retrieving revision 1.1 |
|
74 | 74 | retrieving revision 1.1.2.1 |
|
75 | 75 | Merging differences between 1.1 and 1.1.2.1 into file1 |
@@ -80,7 +80,7 b' merge change to trunk' | |||
|
80 | 80 | |
|
81 | 81 | $ cvscall -Q update -A |
|
82 | 82 | $ cvscall -Q update -jv1_1 |
|
83 |
RCS file: |
|
|
83 | RCS file: $TESTTMP/cvsrepo/proj/file1,v | |
|
84 | 84 | retrieving revision 1.1 |
|
85 | 85 | retrieving revision 1.1.4.1 |
|
86 | 86 | Merging differences between 1.1 and 1.1.4.1 into file1 |
@@ -101,7 +101,7 b' change on trunk to backport' | |||
|
101 | 101 | $ cvsci -m"add other text" file1 |
|
102 | 102 | $ cvscall log file1 |
|
103 | 103 | |
|
104 |
RCS file: |
|
|
104 | RCS file: $TESTTMP/cvsrepo/proj/file1,v | |
|
105 | 105 | Working file: file1 |
|
106 | 106 | head: 1.3 |
|
107 | 107 | branch: |
@@ -141,7 +141,7 b' backport trunk change to v1_1' | |||
|
141 | 141 | |
|
142 | 142 | $ cvscall -Q update -rv1_1 |
|
143 | 143 | $ cvscall -Q update -j1.2 -j1.3 file1 |
|
144 |
RCS file: |
|
|
144 | RCS file: $TESTTMP/cvsrepo/proj/file1,v | |
|
145 | 145 | retrieving revision 1.2 |
|
146 | 146 | retrieving revision 1.3 |
|
147 | 147 | Merging differences between 1.2 and 1.3 into file1 |
@@ -157,7 +157,7 b' fix bug on v1_1, merge to trunk with err' | |||
|
157 | 157 | cvs commit: Examining . |
|
158 | 158 | $ cvscall -Q update -A |
|
159 | 159 | $ cvscall -Q update -junmerged -jv1_1 |
|
160 |
RCS file: |
|
|
160 | RCS file: $TESTTMP/cvsrepo/proj/file1,v | |
|
161 | 161 | retrieving revision 1.1.4.2 |
|
162 | 162 | retrieving revision 1.1.4.3 |
|
163 | 163 | Merging differences between 1.1.4.2 and 1.1.4.3 into file1 |
@@ -173,7 +173,7 b' convert to hg' | |||
|
173 | 173 | $ cd .. |
|
174 | 174 | $ hg convert proj proj.hg |
|
175 | 175 | initializing destination proj.hg repository |
|
176 |
connecting to |
|
|
176 | connecting to $TESTTMP/cvsrepo | |
|
177 | 177 | scanning source... |
|
178 | 178 | collecting CVS rlog |
|
179 | 179 | 12 log entries |
@@ -107,24 +107,24 b' merge file6 from trunk to v1_2' | |||
|
107 | 107 | cvs rlog output |
|
108 | 108 | |
|
109 | 109 | $ cvscall -q rlog proj | egrep '^(RCS file|revision)' |
|
110 |
RCS file: |
|
|
110 | RCS file: $TESTTMP/cvsrepo/proj/file1,v | |
|
111 | 111 | revision 1.1 |
|
112 |
RCS file: |
|
|
112 | RCS file: $TESTTMP/cvsrepo/proj/Attic/file2,v | |
|
113 | 113 | revision 1.1 |
|
114 | 114 | revision 1.1.4.2 |
|
115 | 115 | revision 1.1.4.1 |
|
116 | 116 | revision 1.1.2.1 |
|
117 |
RCS file: |
|
|
117 | RCS file: $TESTTMP/cvsrepo/proj/Attic/file3,v | |
|
118 | 118 | revision 1.1 |
|
119 | 119 | revision 1.1.2.1 |
|
120 |
RCS file: |
|
|
120 | RCS file: $TESTTMP/cvsrepo/proj/Attic/file4,v | |
|
121 | 121 | revision 1.1 |
|
122 | 122 | revision 1.1.2.1 |
|
123 |
RCS file: |
|
|
123 | RCS file: $TESTTMP/cvsrepo/proj/file5,v | |
|
124 | 124 | revision 1.2 |
|
125 | 125 | revision 1.1 |
|
126 | 126 | revision 1.1.2.1 |
|
127 |
RCS file: |
|
|
127 | RCS file: $TESTTMP/cvsrepo/proj/file6,v | |
|
128 | 128 | revision 1.1 |
|
129 | 129 | revision 1.1.2.2 |
|
130 | 130 | revision 1.1.2.1 |
@@ -134,7 +134,7 b' convert to hg (#1)' | |||
|
134 | 134 | $ cd .. |
|
135 | 135 | $ hg convert --datesort proj proj.hg |
|
136 | 136 | initializing destination proj.hg repository |
|
137 |
connecting to |
|
|
137 | connecting to $TESTTMP/cvsrepo | |
|
138 | 138 | scanning source... |
|
139 | 139 | collecting CVS rlog |
|
140 | 140 | 15 log entries |
@@ -178,7 +178,7 b' convert to hg (#2: with merge detection)' | |||
|
178 | 178 | > --datesort \ |
|
179 | 179 | > proj proj.hg2 |
|
180 | 180 | initializing destination proj.hg2 repository |
|
181 |
connecting to |
|
|
181 | connecting to $TESTTMP/cvsrepo | |
|
182 | 182 | scanning source... |
|
183 | 183 | collecting CVS rlog |
|
184 | 184 | 15 log entries |
@@ -66,14 +66,14 b' commit a new revision changing b/c' | |||
|
66 | 66 | $ sleep 1 |
|
67 | 67 | $ echo c >> b/c |
|
68 | 68 | $ cvscall -q commit -mci0 . | grep '<--' |
|
69 |
|
|
|
69 | $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob) | |
|
70 | 70 | $ cd .. |
|
71 | 71 | |
|
72 | 72 | convert fresh repo |
|
73 | 73 | |
|
74 | 74 | $ hg convert src src-hg |
|
75 | 75 | initializing destination src-hg repository |
|
76 |
connecting to |
|
|
76 | connecting to $TESTTMP/cvsrepo | |
|
77 | 77 | scanning source... |
|
78 | 78 | collecting CVS rlog |
|
79 | 79 | 5 log entries |
@@ -98,7 +98,7 b' convert fresh repo with --filemap' | |||
|
98 | 98 | $ echo include b/c > filemap |
|
99 | 99 | $ hg convert --filemap filemap src src-filemap |
|
100 | 100 | initializing destination src-filemap repository |
|
101 |
connecting to |
|
|
101 | connecting to $TESTTMP/cvsrepo | |
|
102 | 102 | scanning source... |
|
103 | 103 | collecting CVS rlog |
|
104 | 104 | 5 log entries |
@@ -135,7 +135,7 b' convert full repository (issue1649)' | |||
|
135 | 135 | > | grep -v 'log entries' | grep -v 'hook:' \ |
|
136 | 136 | > | grep -v '^[0-3] .*' # filter instable changeset order |
|
137 | 137 | initializing destination srcfull-hg repository |
|
138 |
connecting to |
|
|
138 | connecting to $TESTTMP/cvsrepo | |
|
139 | 139 | scanning source... |
|
140 | 140 | collecting CVS rlog |
|
141 | 141 | creating changesets |
@@ -155,14 +155,14 b' commit new file revisions' | |||
|
155 | 155 | $ echo a >> a |
|
156 | 156 | $ echo c >> b/c |
|
157 | 157 | $ cvscall -q commit -mci1 . | grep '<--' |
|
158 |
|
|
|
159 |
|
|
|
158 | $TESTTMP/cvsrepo/src/a,v <-- a | |
|
159 | $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob) | |
|
160 | 160 | $ cd .. |
|
161 | 161 | |
|
162 | 162 | convert again |
|
163 | 163 | |
|
164 | 164 | $ hg convert src src-hg |
|
165 |
connecting to |
|
|
165 | connecting to $TESTTMP/cvsrepo | |
|
166 | 166 | scanning source... |
|
167 | 167 | collecting CVS rlog |
|
168 | 168 | 7 log entries |
@@ -184,7 +184,7 b' convert again' | |||
|
184 | 184 | convert again with --filemap |
|
185 | 185 | |
|
186 | 186 | $ hg convert --filemap filemap src src-filemap |
|
187 |
connecting to |
|
|
187 | connecting to $TESTTMP/cvsrepo | |
|
188 | 188 | scanning source... |
|
189 | 189 | collecting CVS rlog |
|
190 | 190 | 7 log entries |
@@ -216,13 +216,13 b' commit branch' | |||
|
216 | 216 | $ cvs -q update -r branch > /dev/null |
|
217 | 217 | $ echo d >> b/c |
|
218 | 218 | $ cvs -q commit -mci2 . | grep '<--' |
|
219 |
|
|
|
219 | $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob) | |
|
220 | 220 | $ cd .. |
|
221 | 221 | |
|
222 | 222 | convert again |
|
223 | 223 | |
|
224 | 224 | $ hg convert src src-hg |
|
225 |
connecting to |
|
|
225 | connecting to $TESTTMP/cvsrepo | |
|
226 | 226 | scanning source... |
|
227 | 227 | collecting CVS rlog |
|
228 | 228 | 8 log entries |
@@ -240,7 +240,7 b' convert again' | |||
|
240 | 240 | convert again with --filemap |
|
241 | 241 | |
|
242 | 242 | $ hg convert --filemap filemap src src-filemap |
|
243 |
connecting to |
|
|
243 | connecting to $TESTTMP/cvsrepo | |
|
244 | 244 | scanning source... |
|
245 | 245 | collecting CVS rlog |
|
246 | 246 | 8 log entries |
@@ -277,17 +277,17 b' commit new file revisions with some fuzz' | |||
|
277 | 277 | $ sleep 1 |
|
278 | 278 | $ echo f >> a |
|
279 | 279 | $ cvscall -q commit -mfuzzy . | grep '<--' |
|
280 |
|
|
|
280 | $TESTTMP/cvsrepo/src/a,v <-- a | |
|
281 | 281 | $ sleep 4 # the two changes will be split if fuzz < 4 |
|
282 | 282 | $ echo g >> b/c |
|
283 | 283 | $ cvscall -q commit -mfuzzy . | grep '<--' |
|
284 |
|
|
|
284 | $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob) | |
|
285 | 285 | $ cd .. |
|
286 | 286 | |
|
287 | 287 | convert again |
|
288 | 288 | |
|
289 | 289 | $ hg convert --config convert.cvsps.fuzz=2 src src-hg |
|
290 |
connecting to |
|
|
290 | connecting to $TESTTMP/cvsrepo | |
|
291 | 291 | scanning source... |
|
292 | 292 | collecting CVS rlog |
|
293 | 293 | 11 log entries |
@@ -14,7 +14,7 b' Convert while testing all possible outpu' | |||
|
14 | 14 | |
|
15 | 15 | $ hg --debug convert svn-repo A-hg |
|
16 | 16 | initializing destination A-hg repository |
|
17 |
reparent to file:// |
|
|
17 | reparent to file://$TESTTMP/svn-repo | |
|
18 | 18 | run hg sink pre-conversion action |
|
19 | 19 | scanning source... |
|
20 | 20 | found trunk at 'trunk' |
@@ -23,7 +23,7 b' Convert while testing all possible outpu' | |||
|
23 | 23 | found branch branché at 5 |
|
24 | 24 | found branch branchée at 6 |
|
25 | 25 | scanning: 1 revisions |
|
26 |
reparent to file:// |
|
|
26 | reparent to file://$TESTTMP/svn-repo/trunk | |
|
27 | 27 | fetching revision log for "/trunk" from 4 to 0 |
|
28 | 28 | parsing revision 4 (2 changes) |
|
29 | 29 | parsing revision 3 (4 changes) |
@@ -33,18 +33,18 b' Convert while testing all possible outpu' | |||
|
33 | 33 | '/branches' is not under '/trunk', ignoring |
|
34 | 34 | '/tags' is not under '/trunk', ignoring |
|
35 | 35 | scanning: 2 revisions |
|
36 |
reparent to file:// |
|
|
36 | reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9 | |
|
37 | 37 | fetching revision log for "/branches/branché" from 5 to 0 |
|
38 | 38 | parsing revision 5 (1 changes) |
|
39 |
reparent to file:// |
|
|
40 |
reparent to file:// |
|
|
39 | reparent to file://$TESTTMP/svn-repo | |
|
40 | reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9 | |
|
41 | 41 | found parent of branch /branches/branché at 4: /trunk |
|
42 | 42 | scanning: 3 revisions |
|
43 |
reparent to file:// |
|
|
43 | reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e | |
|
44 | 44 | fetching revision log for "/branches/branchée" from 6 to 0 |
|
45 | 45 | parsing revision 6 (1 changes) |
|
46 |
reparent to file:// |
|
|
47 |
reparent to file:// |
|
|
46 | reparent to file://$TESTTMP/svn-repo | |
|
47 | reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e | |
|
48 | 48 | found parent of branch /branches/branchée at 5: /branches/branché |
|
49 | 49 | scanning: 4 revisions |
|
50 | 50 | scanning: 5 revisions |
@@ -57,7 +57,7 b' Convert while testing all possible outpu' | |||
|
57 | 57 | 4 hello |
|
58 | 58 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2 |
|
59 | 59 | converting: 1/6 revisions (16.67%) |
|
60 |
reparent to file:// |
|
|
60 | reparent to file://$TESTTMP/svn-repo/trunk | |
|
61 | 61 | scanning paths: /trunk/à 0/3 (0.00%) |
|
62 | 62 | scanning paths: /trunk/à/é 1/3 (33.33%) |
|
63 | 63 | scanning paths: /trunk/é 2/3 (66.67%) |
@@ -70,14 +70,14 b' Convert while testing all possible outpu' | |||
|
70 | 70 | converting: 2/6 revisions (33.33%) |
|
71 | 71 | scanning paths: /trunk/à 0/4 (0.00%) |
|
72 | 72 | gone from -1 |
|
73 |
reparent to file:// |
|
|
74 |
reparent to file:// |
|
|
73 | reparent to file://$TESTTMP/svn-repo | |
|
74 | reparent to file://$TESTTMP/svn-repo/trunk | |
|
75 | 75 | scanning paths: /trunk/è 1/4 (25.00%) |
|
76 | 76 | copied to è from é@2 |
|
77 | 77 | scanning paths: /trunk/é 2/4 (50.00%) |
|
78 | 78 | gone from -1 |
|
79 |
reparent to file:// |
|
|
80 |
reparent to file:// |
|
|
79 | reparent to file://$TESTTMP/svn-repo | |
|
80 | reparent to file://$TESTTMP/svn-repo/trunk | |
|
81 | 81 | scanning paths: /trunk/ù 3/4 (75.00%) |
|
82 | 82 | mark /trunk/ù came from à:2 |
|
83 | 83 | à/é |
@@ -95,12 +95,12 b' Convert while testing all possible outpu' | |||
|
95 | 95 | converting: 3/6 revisions (50.00%) |
|
96 | 96 | scanning paths: /trunk/è 0/2 (0.00%) |
|
97 | 97 | gone from -1 |
|
98 |
reparent to file:// |
|
|
99 |
reparent to file:// |
|
|
98 | reparent to file://$TESTTMP/svn-repo | |
|
99 | reparent to file://$TESTTMP/svn-repo/trunk | |
|
100 | 100 | scanning paths: /trunk/ù 1/2 (50.00%) |
|
101 | 101 | gone from -1 |
|
102 |
reparent to file:// |
|
|
103 |
reparent to file:// |
|
|
102 | reparent to file://$TESTTMP/svn-repo | |
|
103 | reparent to file://$TESTTMP/svn-repo/trunk | |
|
104 | 104 | è |
|
105 | 105 | getting files: è 1/2 (50.00%) |
|
106 | 106 | ù/é |
@@ -108,17 +108,17 b' Convert while testing all possible outpu' | |||
|
108 | 108 | 1 branch to branch? |
|
109 | 109 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5 |
|
110 | 110 | converting: 4/6 revisions (66.67%) |
|
111 |
reparent to file:// |
|
|
111 | reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9 | |
|
112 | 112 | scanning paths: /branches/branché 0/1 (0.00%) |
|
113 | 113 | 0 branch to branch?e |
|
114 | 114 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6 |
|
115 | 115 | converting: 5/6 revisions (83.33%) |
|
116 |
reparent to file:// |
|
|
116 | reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e | |
|
117 | 117 | scanning paths: /branches/branchée 0/1 (0.00%) |
|
118 |
reparent to file:// |
|
|
119 |
reparent to file:// |
|
|
120 |
reparent to file:// |
|
|
121 |
reparent to file:// |
|
|
118 | reparent to file://$TESTTMP/svn-repo | |
|
119 | reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e | |
|
120 | reparent to file://$TESTTMP/svn-repo | |
|
121 | reparent to file://$TESTTMP/svn-repo/branches/branch%C3%A9e | |
|
122 | 122 | updating tags |
|
123 | 123 | .hgtags |
|
124 | 124 | run hg sink post-conversion action |
@@ -18,7 +18,7 b'' | |||
|
18 | 18 | Push should push to 'default' when 'default-push' not set: |
|
19 | 19 | |
|
20 | 20 | $ hg --cwd b push |
|
21 |
pushing to |
|
|
21 | pushing to $TESTTMP/a | |
|
22 | 22 | searching for changes |
|
23 | 23 | adding changesets |
|
24 | 24 | adding manifests |
@@ -29,7 +29,7 b" Push should push to 'default-push' when " | |||
|
29 | 29 | |
|
30 | 30 | $ echo 'default-push = ../c' >> b/.hg/hgrc |
|
31 | 31 | $ hg --cwd b push |
|
32 |
pushing to |
|
|
32 | pushing to $TESTTMP/c | |
|
33 | 33 | searching for changes |
|
34 | 34 | adding changesets |
|
35 | 35 | adding manifests |
@@ -75,7 +75,7 b' Test diff during merge:' | |||
|
75 | 75 | Should diff cloned file against wc file: |
|
76 | 76 | |
|
77 | 77 | $ hg falabala |
|
78 |
diffing a.2a13a4d2da36/a |
|
|
78 | diffing a.2a13a4d2da36/a $TESTTMP/a/a | |
|
79 | 79 | [1] |
|
80 | 80 | |
|
81 | 81 |
@@ -44,7 +44,7 b' Should display baz only:' | |||
|
44 | 44 | |
|
45 | 45 | $ echo "*.o" > .hgignore |
|
46 | 46 | $ hg status |
|
47 |
abort: |
|
|
47 | abort: $TESTTMP/.hgignore: invalid pattern (relre): *.o | |
|
48 | 48 | [255] |
|
49 | 49 | |
|
50 | 50 | $ echo ".*\.o" > .hgignore |
@@ -88,7 +88,7 b' Check it does not ignore the current dir' | |||
|
88 | 88 | |
|
89 | 89 | $ echo "syntax: invalid" > .hgignore |
|
90 | 90 | $ hg status |
|
91 |
|
|
|
91 | $TESTTMP/.hgignore: ignoring invalid syntax 'invalid' | |
|
92 | 92 | A dir/b.o |
|
93 | 93 | ? .hgignore |
|
94 | 94 | ? a.c |
@@ -1,6 +1,13 b'' | |||
|
1 | Use hgrc within $TESTTMP | |
|
2 | ||
|
3 | $ HGRCPATH=`pwd`/hgrc | |
|
4 | $ export HGRCPATH | |
|
5 | ||
|
6 | Basic syntax error | |
|
7 | ||
|
1 | 8 |
$ |
|
2 | 9 |
$ |
|
3 |
hg: parse error at |
|
|
10 | hg: parse error at $TESTTMP/hgrc:1: invalid | |
|
4 | 11 | [255] |
|
5 | 12 | $ echo "" > $HGRCPATH |
|
6 | 13 | |
@@ -10,7 +17,6 b" Issue1199: Can't use '%' in hgrc (eg url" | |||
|
10 | 17 | $ hg clone "foo%bar" foobar |
|
11 | 18 | updating to branch default |
|
12 | 19 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | $ p=`pwd` | |
|
14 | 20 | $ cd foobar |
|
15 | 21 | $ cat .hg/hgrc |
|
16 | 22 | [paths] |
@@ -27,7 +33,7 b' issue1829: wrong indentation' | |||
|
27 | 33 | $ echo '[foo]' > $HGRCPATH |
|
28 | 34 | $ echo ' x = y' >> $HGRCPATH |
|
29 | 35 | $ hg version |
|
30 |
hg: parse error at |
|
|
36 | hg: parse error at $TESTTMP/hgrc:2: x = y | |
|
31 | 37 | [255] |
|
32 | 38 | |
|
33 | 39 | $ python -c "print '[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n'" \ |
@@ -40,7 +46,7 b' issue1829: wrong indentation' | |||
|
40 | 46 | $ export FAKEPATH |
|
41 | 47 | $ echo '%include $FAKEPATH/no-such-file' > $HGRCPATH |
|
42 | 48 | $ hg version |
|
43 |
hg: parse error at |
|
|
49 | hg: parse error at $TESTTMP/hgrc:1: cannot include /path/to/nowhere/no-such-file (No such file or directory) | |
|
44 | 50 | [255] |
|
45 | 51 | $ unset FAKEPATH |
|
46 | 52 | |
@@ -90,23 +96,23 b' HGPLAIN' | |||
|
90 | 96 | customized hgrc |
|
91 | 97 | |
|
92 | 98 | $ hg showconfig |
|
93 |
read config from: |
|
|
94 |
|
|
|
95 |
|
|
|
96 |
|
|
|
97 |
|
|
|
98 |
|
|
|
99 |
|
|
|
100 |
|
|
|
101 |
|
|
|
102 |
|
|
|
103 |
|
|
|
99 | read config from: $TESTTMP/hgrc | |
|
100 | $TESTTMP/hgrc:13: alias.log=log -g | |
|
101 | $TESTTMP/hgrc:11: defaults.identify=-n | |
|
102 | $TESTTMP/hgrc:2: ui.debug=true | |
|
103 | $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII | |
|
104 | $TESTTMP/hgrc:4: ui.quiet=true | |
|
105 | $TESTTMP/hgrc:5: ui.slash=true | |
|
106 | $TESTTMP/hgrc:6: ui.traceback=true | |
|
107 | $TESTTMP/hgrc:7: ui.verbose=true | |
|
108 | $TESTTMP/hgrc:8: ui.style=~/.hgstyle | |
|
109 | $TESTTMP/hgrc:9: ui.logtemplate={node} | |
|
104 | 110 | |
|
105 | 111 | plain hgrc |
|
106 | 112 | |
|
107 | 113 | $ HGPLAIN=; export HGPLAIN |
|
108 | 114 | $ hg showconfig --config ui.traceback=True --debug |
|
109 |
read config from: |
|
|
115 | read config from: $TESTTMP/hgrc | |
|
110 | 116 | none: ui.traceback=True |
|
111 | 117 | none: ui.verbose=False |
|
112 | 118 | none: ui.debug=True |
@@ -17,7 +17,7 b' commit hooks can see env vars' | |||
|
17 | 17 | $ hg add a |
|
18 | 18 | $ hg commit -m a |
|
19 | 19 | precommit hook: HG_PARENT1=0000000000000000000000000000000000000000 |
|
20 |
pretxncommit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$ |
|
|
20 | pretxncommit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$TESTTMP/a | |
|
21 | 21 | 0:cb9a9f314b8b |
|
22 | 22 | commit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 |
|
23 | 23 | commit.b hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 |
@@ -40,7 +40,7 b' pretxncommit and commit hooks can see bo' | |||
|
40 | 40 | $ echo b >> a |
|
41 | 41 | $ hg commit -m a1 -d "1 0" |
|
42 | 42 | precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b |
|
43 |
pretxncommit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$ |
|
|
43 | pretxncommit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$TESTTMP/a | |
|
44 | 44 | 1:ab228980c14d |
|
45 | 45 | commit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b |
|
46 | 46 | commit.b hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b |
@@ -50,7 +50,7 b' pretxncommit and commit hooks can see bo' | |||
|
50 | 50 | $ hg add b |
|
51 | 51 | $ hg commit -m b -d '1 0' |
|
52 | 52 | precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b |
|
53 |
pretxncommit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$ |
|
|
53 | pretxncommit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$TESTTMP/a | |
|
54 | 54 | 2:ee9deb46ab31 |
|
55 | 55 | commit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b |
|
56 | 56 | commit.b hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b |
@@ -60,7 +60,7 b' pretxncommit and commit hooks can see bo' | |||
|
60 | 60 | (branch merge, don't forget to commit) |
|
61 | 61 | $ hg commit -m merge -d '2 0' |
|
62 | 62 | precommit hook: HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd |
|
63 |
pretxncommit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$ |
|
|
63 | pretxncommit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$TESTTMP/a | |
|
64 | 64 | 3:07f3376c1e65 |
|
65 | 65 | commit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd |
|
66 | 66 | commit.b hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd |
@@ -99,7 +99,7 b' tag hooks can see env vars' | |||
|
99 | 99 |
$ |
|
100 | 100 | pretag hook: HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a |
|
101 | 101 | precommit hook: HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 |
|
102 |
pretxncommit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$ |
|
|
102 | pretxncommit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$TESTTMP/a | |
|
103 | 103 | 4:539e4b31b6dc |
|
104 | 104 | commit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 |
|
105 | 105 | commit.b hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 |
@@ -133,10 +133,10 b' more there after' | |||
|
133 | 133 | 4:539e4b31b6dc |
|
134 | 134 | $ hg commit -m 'fail' -d '4 0' |
|
135 | 135 | precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 |
|
136 |
pretxncommit hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$ |
|
|
136 | pretxncommit hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a | |
|
137 | 137 | 5:6f611f8018c1 |
|
138 | 138 | 5:6f611f8018c1 |
|
139 |
pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$ |
|
|
139 | pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a | |
|
140 | 140 | transaction abort! |
|
141 | 141 | rollback completed |
|
142 | 142 | abort: pretxncommit.forbid1 hook exited with status 1 |
@@ -192,7 +192,7 b' incoming changes no longer there after' | |||
|
192 | 192 | $ echo 'pretxnchangegroup.forbid1 = python ../printenv.py pretxnchangegroup.forbid 1' >> .hg/hgrc |
|
193 | 193 | $ hg pull ../a |
|
194 | 194 | 4:539e4b31b6dc |
|
195 |
pretxnchangegroup.forbid hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$ |
|
|
195 | pretxnchangegroup.forbid hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/b HG_SOURCE=pull HG_URL=file: | |
|
196 | 196 | pulling from ../a |
|
197 | 197 | searching for changes |
|
198 | 198 | adding changesets |
@@ -27,7 +27,7 b' Check that zero-size journals are correc' | |||
|
27 | 27 | |
|
28 | 28 | $ hg -R foo unbundle repo.hg |
|
29 | 29 | adding changesets |
|
30 | abort: Permission denied: * (glob) | |
|
30 | abort: Permission denied: $TESTTMP/foo/.hg/store/.00changelog.i-* (glob) | |
|
31 | 31 | [255] |
|
32 | 32 | |
|
33 | 33 |
$ |
@@ -154,7 +154,7 b' hg cat files and symlink, no expansion' | |||
|
154 | 154 | do not process $Id: |
|
155 | 155 | xxx $ |
|
156 | 156 | ignore $Id$ |
|
157 | a* (glob) | |
|
157 | a | |
|
158 | 158 | |
|
159 | 159 | Test hook execution |
|
160 | 160 | |
@@ -197,13 +197,13 b' Pull from bundle and trigger notify' | |||
|
197 | 197 | MIME-Version: 1.0 |
|
198 | 198 | Content-Transfer-Encoding: 7bit |
|
199 | 199 | Date: * (glob) |
|
200 |
Subject: changeset in |
|
|
200 | Subject: changeset in $TESTTMP/Test: addsym | |
|
201 | 201 | From: mercurial |
|
202 | 202 | X-Hg-Notification: changeset a2392c293916 |
|
203 | 203 | Message-Id: <hg.a2392c293916*> (glob) |
|
204 | 204 | To: Test |
|
205 | 205 | |
|
206 |
changeset a2392c293916 in |
|
|
206 | changeset a2392c293916 in $TESTTMP/Test | |
|
207 | 207 | details: *cmd=changeset;node=a2392c293916 (glob) |
|
208 | 208 | description: |
|
209 | 209 | addsym |
@@ -220,14 +220,14 b' Pull from bundle and trigger notify' | |||
|
220 | 220 | MIME-Version: 1.0 |
|
221 | 221 | Content-Transfer-Encoding: 7bit |
|
222 | 222 | Date:* (glob) |
|
223 |
Subject: changeset in |
|
|
223 | Subject: changeset in $TESTTMP/Test: absym | |
|
224 | 224 | From: User Name <user@example.com> |
|
225 | 225 | X-Hg-Notification: changeset ef63ca68695b |
|
226 | 226 | Message-Id: <hg.ef63ca68695b*> (glob) |
|
227 | 227 | To: Test |
|
228 | 228 | |
|
229 |
changeset ef63ca68695b in |
|
|
230 |
details: |
|
|
229 | changeset ef63ca68695b in $TESTTMP/Test | |
|
230 | details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b | |
|
231 | 231 | description: |
|
232 | 232 | absym |
|
233 | 233 | |
@@ -614,7 +614,7 b' Cat and hg cat files before custom expan' | |||
|
614 | 614 | do not process $Id: |
|
615 | 615 | xxx $ |
|
616 | 616 | ignore $Id$ |
|
617 | a* (glob) | |
|
617 | a | |
|
618 | 618 | |
|
619 | 619 | Write custom keyword and prepare multiline commit message |
|
620 | 620 | |
@@ -664,7 +664,7 b' Stat, verify and show custom expansion (' | |||
|
664 | 664 | xxx $ |
|
665 | 665 | $Xinfo: User Name <user@example.com>: firstline $ |
|
666 | 666 | ignore $Id$ |
|
667 | a* (glob) | |
|
667 | a | |
|
668 | 668 | |
|
669 | 669 | annotate |
|
670 | 670 | |
@@ -735,7 +735,7 b' Clone to test incoming' | |||
|
735 | 735 | > default = ../Test |
|
736 | 736 | > EOF |
|
737 | 737 | $ hg incoming |
|
738 |
comparing with |
|
|
738 | comparing with $TESTTMP/Test | |
|
739 | 739 | searching for changes |
|
740 | 740 | changeset: 2:bb948857c743 |
|
741 | 741 | tag: tip |
@@ -994,7 +994,7 b' Keywords shrunk in working directory, bu' | |||
|
994 | 994 | xxx $ |
|
995 | 995 | $Xinfo: User Name <user@example.com>: firstline $ |
|
996 | 996 | ignore $Id$ |
|
997 | a* (glob) | |
|
997 | a | |
|
998 | 998 | |
|
999 | 999 | Now disable keyword expansion |
|
1000 | 1000 | |
@@ -1011,4 +1011,4 b' Now disable keyword expansion' | |||
|
1011 | 1011 | xxx $ |
|
1012 | 1012 | $Xinfo$ |
|
1013 | 1013 | ignore $Id$ |
|
1014 | a* (glob) | |
|
1014 | a |
@@ -32,7 +32,7 b' Create a patch removing a:' | |||
|
32 | 32 | Save the patch queue so we can merge it later: |
|
33 | 33 | |
|
34 | 34 | $ hg qsave -c -e |
|
35 |
copy |
|
|
35 | copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 | |
|
36 | 36 | $ checkundo |
|
37 | 37 | |
|
38 | 38 | Update b and commit in an "update" changeset: |
@@ -52,7 +52,7 b' Update b and commit in an "update" chang' | |||
|
52 | 52 | b |
|
53 | 53 | |
|
54 | 54 | $ hg qpush -a -m |
|
55 |
merging with queue at: |
|
|
55 | merging with queue at: $TESTTMP/t/.hg/patches.1 | |
|
56 | 56 | applying rm_a |
|
57 | 57 | now at: rm_a |
|
58 | 58 | |
@@ -91,14 +91,14 b' Classic MQ merge sequence *with an expli' | |||
|
91 | 91 | Create the reference queue: |
|
92 | 92 | |
|
93 | 93 | $ hg qsave -c -e -n refqueue |
|
94 |
copy |
|
|
94 | copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue | |
|
95 | 95 | $ hg up -C 1 |
|
96 | 96 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
97 | 97 | |
|
98 | 98 | Merge: |
|
99 | 99 | |
|
100 | 100 | $ HGMERGE=internal:other hg qpush -a -m -n refqueue |
|
101 |
merging with queue at: |
|
|
101 | merging with queue at: $TESTTMP/t2/.hg/refqueue | |
|
102 | 102 | applying patcha |
|
103 | 103 | patching file a |
|
104 | 104 | Hunk #1 FAILED at 0 |
@@ -39,7 +39,7 b' qpop/qrefresh on the wrong revision' | |||
|
39 | 39 | abort: popping would remove a revision not managed by this patch queue |
|
40 | 40 | [255] |
|
41 | 41 | $ hg qpop -n patches |
|
42 |
using patch queue: |
|
|
42 | using patch queue: $TESTTMP/repo/.hg/patches | |
|
43 | 43 | abort: popping would remove a revision not managed by this patch queue |
|
44 | 44 | [255] |
|
45 | 45 | $ hg qrefresh |
@@ -77,7 +77,7 b'' | |||
|
77 | 77 | summary: e |
|
78 | 78 | |
|
79 | 79 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
80 | saved backup bundle to * (glob) | |
|
80 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
81 | 81 | % after update 4, strip 4 |
|
82 | 82 | changeset: 3:65bd5f99a4a3 |
|
83 | 83 | tag: tip |
@@ -96,7 +96,7 b'' | |||
|
96 | 96 | summary: e |
|
97 | 97 | |
|
98 | 98 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
99 | saved backup bundle to * (glob) | |
|
99 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
100 | 100 | % after update 4, strip 3 |
|
101 | 101 | changeset: 1:ef3a871183d7 |
|
102 | 102 | user: test |
@@ -111,7 +111,7 b'' | |||
|
111 | 111 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
112 | 112 | summary: b |
|
113 | 113 | |
|
114 | saved backup bundle to * (glob) | |
|
114 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
115 | 115 | % after update 1, strip 4 |
|
116 | 116 | changeset: 1:ef3a871183d7 |
|
117 | 117 | user: test |
@@ -127,7 +127,7 b'' | |||
|
127 | 127 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
128 | 128 | summary: e |
|
129 | 129 | |
|
130 | saved backup bundle to * (glob) | |
|
130 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
131 | 131 | % after update 4, strip 2 |
|
132 | 132 | changeset: 3:443431ffac4f |
|
133 | 133 | tag: tip |
@@ -146,7 +146,7 b'' | |||
|
146 | 146 | summary: c |
|
147 | 147 | |
|
148 | 148 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
149 | saved backup bundle to * (glob) | |
|
149 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
150 | 150 | % after update 4, strip 1 |
|
151 | 151 | changeset: 0:9ab35a2d17cb |
|
152 | 152 | tag: tip |
@@ -157,7 +157,7 b'' | |||
|
157 | 157 | $ teststrip null 4 |
|
158 | 158 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
159 | 159 | % before update null, strip 4 |
|
160 | saved backup bundle to * (glob) | |
|
160 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
161 | 161 | % after update null, strip 4 |
|
162 | 162 | |
|
163 | 163 | $ hg log |
@@ -212,7 +212,7 b' before strip of merge parent' | |||
|
212 | 212 | |
|
213 | 213 | $ hg strip 4 |
|
214 | 214 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
215 | saved backup bundle to * (glob) | |
|
215 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
216 | 216 | |
|
217 | 217 | after strip of merge parent |
|
218 | 218 | |
@@ -258,7 +258,7 b' after strip of merge parent' | |||
|
258 | 258 | 2 is parent of 3, only one strip should happen |
|
259 | 259 | |
|
260 | 260 | $ hg strip 2 3 |
|
261 | saved backup bundle to * (glob) | |
|
261 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
262 | 262 | $ hg glog |
|
263 | 263 | @ changeset: 2:264128213d29 |
|
264 | 264 | | tag: tip |
@@ -310,8 +310,8 b' 2 different branches: 2 strips' | |||
|
310 | 310 | |
|
311 | 311 | $ hg strip 2 4 |
|
312 | 312 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
313 | saved backup bundle to * (glob) | |
|
314 | saved backup bundle to * (glob) | |
|
313 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
314 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
315 | 315 | $ hg glog |
|
316 | 316 | @ changeset: 2:65bd5f99a4a3 |
|
317 | 317 | | tag: tip |
@@ -335,14 +335,14 b' 2 different branches and a common ancest' | |||
|
335 | 335 | |
|
336 | 336 | $ hg strip 1 2 4 |
|
337 | 337 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
338 | saved backup bundle to * (glob) | |
|
338 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
339 | 339 | $ restore |
|
340 | 340 | |
|
341 | 341 | |
|
342 | 342 | remove branchy history for qimport tests |
|
343 | 343 | |
|
344 | 344 | $ hg strip 3 |
|
345 | saved backup bundle to * (glob) | |
|
345 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
346 | 346 | |
|
347 | 347 | |
|
348 | 348 | strip of applied mq should cleanup status file |
@@ -364,7 +364,7 b' stripping revision in queue' | |||
|
364 | 364 | |
|
365 | 365 | $ hg strip 3 |
|
366 | 366 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
367 | saved backup bundle to * (glob) | |
|
367 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
368 | 368 | |
|
369 | 369 | applied patches after stripping rev in queue |
|
370 | 370 | |
@@ -375,7 +375,7 b' stripping ancestor of queue' | |||
|
375 | 375 | |
|
376 | 376 | $ hg strip 1 |
|
377 | 377 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
378 | saved backup bundle to * (glob) | |
|
378 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
|
379 | 379 | |
|
380 | 380 | applied patches after stripping ancestor of queue |
|
381 | 381 |
@@ -135,7 +135,7 b' qinit -c should create both files if the' | |||
|
135 | 135 | guards |
|
136 | 136 | $ cat .hg/patches/series |
|
137 | 137 | $ hg qinit -c |
|
138 |
abort: repository |
|
|
138 | abort: repository $TESTTMP/d/.hg/patches already exists! | |
|
139 | 139 | [255] |
|
140 | 140 | $ cd .. |
|
141 | 141 | |
@@ -737,7 +737,7 b' strip' | |||
|
737 | 737 | adding x |
|
738 | 738 | $ hg strip tip |
|
739 | 739 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
740 | saved backup bundle to * (glob) | |
|
740 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) | |
|
741 | 741 | $ hg unbundle .hg/strip-backup/* |
|
742 | 742 | adding changesets |
|
743 | 743 | adding manifests |
@@ -760,7 +760,7 b' strip with local changes, should complai' | |||
|
760 | 760 | |
|
761 | 761 | $ hg strip -f tip |
|
762 | 762 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
763 | saved backup bundle to * (glob) | |
|
763 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) | |
|
764 | 764 | |
|
765 | 765 | |
|
766 | 766 | cd b; hg qrefresh |
@@ -1118,7 +1118,7 b' strip again' | |||
|
1118 | 1118 | |
|
1119 | 1119 | $ hg strip 1 |
|
1120 | 1120 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1121 | saved backup bundle to * (glob) | |
|
1121 | saved backup bundle to $TESTTMP/b/strip/.hg/strip-backup/*-backup.hg (glob) | |
|
1122 | 1122 | $ checkundo strip |
|
1123 | 1123 | $ hg log |
|
1124 | 1124 | changeset: 1:20cbbe65cff7 |
@@ -56,12 +56,12 b' push' | |||
|
56 | 56 | Message-Id: <*> (glob) |
|
57 | 57 | To: baz, foo@bar |
|
58 | 58 | |
|
59 |
changeset cb9a9f314b8b in |
|
|
60 |
details: |
|
|
59 | changeset cb9a9f314b8b in $TESTTMP/a | |
|
60 | details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b | |
|
61 | 61 | summary: a |
|
62 | 62 | |
|
63 |
changeset ba677d0156c1 in |
|
|
64 |
details: |
|
|
63 | changeset ba677d0156c1 in $TESTTMP/a | |
|
64 | details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1 | |
|
65 | 65 | summary: b |
|
66 | 66 | |
|
67 | 67 | diffs (6 lines): |
@@ -120,14 +120,14 b' pull (minimal config)' | |||
|
120 | 120 | MIME-Version: 1.0 |
|
121 | 121 | Content-Transfer-Encoding: 7bit |
|
122 | 122 | Date: * (glob) |
|
123 |
Subject: changeset in |
|
|
123 | Subject: changeset in $TESTTMP/b: b | |
|
124 | 124 | From: test |
|
125 | 125 | X-Hg-Notification: changeset 0647d048b600 |
|
126 | 126 | Message-Id: <*> (glob) |
|
127 | 127 | To: baz, foo@bar |
|
128 | 128 | |
|
129 |
changeset 0647d048b600 in |
|
|
130 |
details: |
|
|
129 | changeset 0647d048b600 in $TESTTMP/b | |
|
130 | details: $TESTTMP/b?cmd=changeset;node=0647d048b600 | |
|
131 | 131 | description: b |
|
132 | 132 | |
|
133 | 133 | diffs (6 lines): |
@@ -6,11 +6,11 b'' | |||
|
6 | 6 | $ echo '[paths]' >> .hg/hgrc |
|
7 | 7 | $ echo 'dupe = ../b' >> .hg/hgrc |
|
8 | 8 | $ hg in dupe |
|
9 |
comparing with |
|
|
9 | comparing with $TESTTMP/b | |
|
10 | 10 | no changes found |
|
11 | 11 | [1] |
|
12 | 12 | $ cd .. |
|
13 | 13 | $ hg -R a in dupe |
|
14 |
comparing with |
|
|
14 | comparing with $TESTTMP/b | |
|
15 | 15 | no changes found |
|
16 | 16 | [1] |
@@ -20,7 +20,7 b'' | |||
|
20 | 20 | checking manifests |
|
21 | 21 | crosschecking files in changesets and manifests |
|
22 | 22 | checking files |
|
23 |
abort: Permission denied: |
|
|
23 | abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i | |
|
24 | 24 | [255] |
|
25 | 25 | |
|
26 | 26 | $ chmod +r .hg/store/data/a.i |
@@ -37,7 +37,7 b'' | |||
|
37 | 37 | $ echo barber > a |
|
38 | 38 | $ hg commit -m "2" |
|
39 | 39 | trouble committing a! |
|
40 |
abort: Permission denied: |
|
|
40 | abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i | |
|
41 | 41 | [255] |
|
42 | 42 | |
|
43 | 43 | $ chmod -w . |
@@ -40,7 +40,7 b' Expected to fail:' | |||
|
40 | 40 | Expected to fail: |
|
41 | 41 | |
|
42 | 42 | $ hg push |
|
43 | pushing to * (glob) | |
|
43 | pushing to $TESTTMP/test | |
|
44 | 44 | searching for changes |
|
45 | 45 | adding changesets |
|
46 | 46 | adding manifests |
@@ -56,7 +56,7 b' Conflicting rebase:' | |||
|
56 | 56 | Abort: |
|
57 | 57 | |
|
58 | 58 | $ hg rebase --abort |
|
59 |
saved backup bundle to |
|
|
59 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | |
|
60 | 60 | rebase aborted |
|
61 | 61 | |
|
62 | 62 | $ hg tglog |
@@ -98,7 +98,7 b' Rebase part of branch2 (5-6) onto branch' | |||
|
98 | 98 | 0: 'A' |
|
99 | 99 | |
|
100 | 100 | $ hg rebase --detach -s 5 -d 8 |
|
101 |
saved backup bundle to |
|
|
101 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | |
|
102 | 102 | |
|
103 | 103 | $ hg branches |
|
104 | 104 | branch3 8:c1d4b9719987 |
@@ -159,7 +159,7 b' Rebase head of branch3 (8) onto branch2 ' | |||
|
159 | 159 | o 0: 'A' |
|
160 | 160 | |
|
161 | 161 | $ hg rebase --detach -s 8 -d 6 |
|
162 |
saved backup bundle to |
|
|
162 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) | |
|
163 | 163 | |
|
164 | 164 | $ hg branches |
|
165 | 165 | branch2 8:e1e80ed73210 |
@@ -223,7 +223,7 b' Rebase entire branch3 (7-8) onto branch2' | |||
|
223 | 223 | o 0: 'A' |
|
224 | 224 | |
|
225 | 225 | $ hg rebase --detach -s 7 -d 6 |
|
226 |
saved backup bundle to |
|
|
226 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) | |
|
227 | 227 | |
|
228 | 228 | $ hg branches |
|
229 | 229 | branch2 7:e1e80ed73210 |
@@ -125,7 +125,7 b' Solve the conflict and go on:' | |||
|
125 | 125 | $ rm A.orig |
|
126 | 126 | $ hg resolve -m A |
|
127 | 127 | $ hg rebase --continue |
|
128 |
saved backup bundle to |
|
|
128 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) | |
|
129 | 129 | |
|
130 | 130 | $ hg tglog |
|
131 | 131 | @ 5: 'F' notdefault |
@@ -77,7 +77,7 b' Rebasing B onto H:' | |||
|
77 | 77 | $ cd a1 |
|
78 | 78 | |
|
79 | 79 | $ hg rebase --collapse --keepbranches |
|
80 |
saved backup bundle to |
|
|
80 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | |
|
81 | 81 | |
|
82 | 82 | $ hg tglog |
|
83 | 83 | @ 5: 'Collapsed revision |
@@ -111,7 +111,7 b' Rebasing G onto H:' | |||
|
111 | 111 | $ cd a2 |
|
112 | 112 | |
|
113 | 113 | $ hg rebase --base 6 --collapse |
|
114 |
saved backup bundle to |
|
|
114 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) | |
|
115 | 115 | |
|
116 | 116 | $ hg tglog |
|
117 | 117 | @ 6: 'Collapsed revision |
@@ -220,7 +220,7 b' Rebase and collapse - more than one exte' | |||
|
220 | 220 | Rebase and collapse - E onto H: |
|
221 | 221 | |
|
222 | 222 | $ hg rebase -s 4 --collapse |
|
223 |
saved backup bundle to |
|
|
223 | saved backup bundle to $TESTTMP/b1/.hg/strip-backup/*-backup.hg (glob) | |
|
224 | 224 | |
|
225 | 225 | $ hg tglog |
|
226 | 226 | @ 5: 'Collapsed revision |
@@ -331,7 +331,7 b' Rebase and collapse - E onto I:' | |||
|
331 | 331 | |
|
332 | 332 | $ hg rebase -s 4 --collapse |
|
333 | 333 | merging E |
|
334 |
saved backup bundle to |
|
|
334 | saved backup bundle to $TESTTMP/c1/.hg/strip-backup/*-backup.hg (glob) | |
|
335 | 335 | |
|
336 | 336 | $ hg tglog |
|
337 | 337 | @ 5: 'Collapsed revision |
@@ -420,7 +420,7 b' Rebase and collapse - B onto F:' | |||
|
420 | 420 | $ cd d1 |
|
421 | 421 | |
|
422 | 422 | $ hg rebase -s 1 --collapse |
|
423 |
saved backup bundle to |
|
|
423 | saved backup bundle to $TESTTMP/d1/.hg/strip-backup/*-backup.hg (glob) | |
|
424 | 424 | |
|
425 | 425 | $ hg tglog |
|
426 | 426 | @ 2: 'Collapsed revision |
@@ -73,7 +73,7 b' Conclude rebase:' | |||
|
73 | 73 | $ echo 'resolved merge' >common |
|
74 | 74 | $ hg resolve -m common |
|
75 | 75 | $ hg rebase --continue |
|
76 |
saved backup bundle to |
|
|
76 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | |
|
77 | 77 | |
|
78 | 78 | $ hg tglog |
|
79 | 79 | @ 5: 'L3' |
@@ -54,7 +54,7 b' Rebasing D onto E detaching from C:' | |||
|
54 | 54 | o 0: 'A' |
|
55 | 55 | |
|
56 | 56 | $ hg rebase --detach -s 3 -d 4 |
|
57 |
saved backup bundle to |
|
|
57 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | |
|
58 | 58 | |
|
59 | 59 | $ hg tglog |
|
60 | 60 | @ 4: 'D' |
@@ -92,7 +92,7 b' Rebasing C onto E detaching from B:' | |||
|
92 | 92 | o 0: 'A' |
|
93 | 93 | |
|
94 | 94 | $ hg rebase --detach -s 2 -d 4 |
|
95 |
saved backup bundle to |
|
|
95 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) | |
|
96 | 96 | |
|
97 | 97 | $ hg tglog |
|
98 | 98 | @ 4: 'D' |
@@ -131,7 +131,7 b' Rebasing B onto E using detach (same as ' | |||
|
131 | 131 | o 0: 'A' |
|
132 | 132 | |
|
133 | 133 | $ hg rebase --detach -s 1 -d 4 |
|
134 |
saved backup bundle to |
|
|
134 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) | |
|
135 | 135 | |
|
136 | 136 | $ hg tglog |
|
137 | 137 | @ 4: 'D' |
@@ -171,7 +171,7 b' Rebasing C onto E detaching from B and c' | |||
|
171 | 171 | o 0: 'A' |
|
172 | 172 | |
|
173 | 173 | $ hg rebase --detach --collapse -s 2 -d 4 |
|
174 |
saved backup bundle to |
|
|
174 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) | |
|
175 | 175 | |
|
176 | 176 | $ hg tglog |
|
177 | 177 | @ 3: 'Collapsed revision |
@@ -50,7 +50,7 b' Rebase with no arguments - single revisi' | |||
|
50 | 50 | $ hg up -q -C 2 |
|
51 | 51 | |
|
52 | 52 | $ hg rebase |
|
53 |
saved backup bundle to |
|
|
53 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | |
|
54 | 54 | |
|
55 | 55 | $ hg tglog |
|
56 | 56 | @ 4: 'l1' |
@@ -108,7 +108,7 b' Rebase with no arguments - single revisi' | |||
|
108 | 108 | $ hg up -q -C 3 |
|
109 | 109 | |
|
110 | 110 | $ hg rebase |
|
111 |
saved backup bundle to |
|
|
111 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) | |
|
112 | 112 | |
|
113 | 113 | $ hg tglog |
|
114 | 114 | @ 4: 'l2' |
@@ -53,7 +53,7 b' Rebase a branch while preserving the bra' | |||
|
53 | 53 | $ hg up -q -C 3 |
|
54 | 54 | |
|
55 | 55 | $ hg rebase -b 4 -d 3 --keepbranches |
|
56 |
saved backup bundle to |
|
|
56 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | |
|
57 | 57 | |
|
58 | 58 | $ hg tglog |
|
59 | 59 | @ 4: 'r1' notdefault |
@@ -48,7 +48,7 b' already has one local mq patch' | |||
|
48 | 48 | $ hg up -q -C qtip |
|
49 | 49 | |
|
50 | 50 | $ hg rebase |
|
51 |
saved backup bundle to |
|
|
51 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | |
|
52 | 52 | |
|
53 | 53 | $ hg tglog |
|
54 | 54 | @ 3: 'P0' tags: p0.patch qbase qtip tip |
@@ -111,7 +111,7 b' already has one local mq patch' | |||
|
111 | 111 | $ HGMERGE=internal:local hg resolve --all |
|
112 | 112 | |
|
113 | 113 | $ hg rebase --continue |
|
114 |
saved backup bundle to |
|
|
114 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) | |
|
115 | 115 | |
|
116 | 116 | $ hg tglog |
|
117 | 117 | @ 9: 'r5' tags: 5.diff qtip tip |
@@ -82,7 +82,7 b' Fix the 2nd conflict:' | |||
|
82 | 82 | $ echo mq1r1mq2 > f |
|
83 | 83 | $ hg resolve -m f |
|
84 | 84 | $ hg rebase -c |
|
85 |
saved backup bundle to |
|
|
85 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | |
|
86 | 86 | |
|
87 | 87 | $ hg tglog |
|
88 | 88 | @ 3: 'P1' tags: f2.patch qtip tip |
@@ -191,7 +191,7 b' Adding one git-style patch and one norma' | |||
|
191 | 191 | Rebase the applied mq patches: |
|
192 | 192 | |
|
193 | 193 | $ hg rebase -s 2 -d 1 |
|
194 |
saved backup bundle to |
|
|
194 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | |
|
195 | 195 | |
|
196 | 196 | $ hg qci -m 'save patch state' |
|
197 | 197 |
@@ -41,7 +41,7 b'' | |||
|
41 | 41 | $ hg rebase -s 1 -d 3 |
|
42 | 42 | merging a |
|
43 | 43 | merging a |
|
44 |
saved backup bundle to |
|
|
44 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob) | |
|
45 | 45 | |
|
46 | 46 | $ hg tglog |
|
47 | 47 | @ 3: 'C' |
@@ -107,7 +107,7 b' Rebase with no arguments (from 3 onto 7)' | |||
|
107 | 107 | $ hg up -q -C 5 |
|
108 | 108 | |
|
109 | 109 | $ hg rebase |
|
110 |
saved backup bundle to |
|
|
110 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | |
|
111 | 111 | |
|
112 | 112 | $ hg tglog |
|
113 | 113 | @ 7: 'l3' |
@@ -141,7 +141,7 b" Rebase with base == '.' => same as no ar" | |||
|
141 | 141 | $ cd a2 |
|
142 | 142 | |
|
143 | 143 | $ hg rebase --base . |
|
144 |
saved backup bundle to |
|
|
144 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) | |
|
145 | 145 | |
|
146 | 146 | $ hg tglog |
|
147 | 147 | @ 7: 'l3' |
@@ -169,7 +169,7 b' Rebase with dest == `hg branch` => same ' | |||
|
169 | 169 | $ cd a3 |
|
170 | 170 | |
|
171 | 171 | $ hg rebase --dest `hg branch` |
|
172 |
saved backup bundle to |
|
|
172 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) | |
|
173 | 173 | |
|
174 | 174 | $ hg tglog |
|
175 | 175 | @ 7: 'l3' |
@@ -197,7 +197,7 b' Specify only source (from 4 onto 7):' | |||
|
197 | 197 | $ cd a4 |
|
198 | 198 | |
|
199 | 199 | $ hg rebase --source 4 |
|
200 |
saved backup bundle to |
|
|
200 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) | |
|
201 | 201 | |
|
202 | 202 | $ hg tglog |
|
203 | 203 | @ 7: 'l3' |
@@ -225,7 +225,7 b' Specify only dest (from 3 onto 6):' | |||
|
225 | 225 | $ cd a5 |
|
226 | 226 | |
|
227 | 227 | $ hg rebase --dest 6 |
|
228 |
saved backup bundle to |
|
|
228 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) | |
|
229 | 229 | |
|
230 | 230 | $ hg tglog |
|
231 | 231 | @ 7: 'l3' |
@@ -253,7 +253,7 b' Specify only base (from 3 onto 7):' | |||
|
253 | 253 | $ cd a6 |
|
254 | 254 | |
|
255 | 255 | $ hg rebase --base 5 |
|
256 |
saved backup bundle to |
|
|
256 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) | |
|
257 | 257 | |
|
258 | 258 | $ hg tglog |
|
259 | 259 | @ 7: 'l3' |
@@ -281,7 +281,7 b' Specify source and dest (from 4 onto 6):' | |||
|
281 | 281 | $ cd a7 |
|
282 | 282 | |
|
283 | 283 | $ hg rebase --source 4 --dest 6 |
|
284 |
saved backup bundle to |
|
|
284 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/*-backup.hg (glob) | |
|
285 | 285 | |
|
286 | 286 | $ hg tglog |
|
287 | 287 | @ 7: 'l3' |
@@ -309,7 +309,7 b' Specify base and dest (from 3 onto 6):' | |||
|
309 | 309 | $ cd a8 |
|
310 | 310 | |
|
311 | 311 | $ hg rebase --base 4 --dest 6 |
|
312 |
saved backup bundle to |
|
|
312 | saved backup bundle to $TESTTMP/a8/.hg/strip-backup/*-backup.hg (glob) | |
|
313 | 313 | |
|
314 | 314 | $ hg tglog |
|
315 | 315 | @ 7: 'l3' |
@@ -48,13 +48,13 b'' | |||
|
48 | 48 | Now b has one revision to be pulled from a: |
|
49 | 49 | |
|
50 | 50 | $ hg pull --rebase |
|
51 |
pulling from |
|
|
51 | pulling from $TESTTMP/a | |
|
52 | 52 | searching for changes |
|
53 | 53 | adding changesets |
|
54 | 54 | adding manifests |
|
55 | 55 | adding file changes |
|
56 | 56 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
57 |
saved backup bundle to |
|
|
57 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) | |
|
58 | 58 | |
|
59 | 59 | $ hg tglog |
|
60 | 60 | @ 3: 'L1' |
@@ -68,7 +68,7 b' Now b has one revision to be pulled from' | |||
|
68 | 68 | Re-run: |
|
69 | 69 | |
|
70 | 70 | $ hg pull --rebase |
|
71 |
pulling from |
|
|
71 | pulling from $TESTTMP/a | |
|
72 | 72 | searching for changes |
|
73 | 73 | no changes found |
|
74 | 74 | |
@@ -78,7 +78,7 b' Invoke pull --rebase and nothing to reba' | |||
|
78 | 78 | $ cd ../c |
|
79 | 79 | |
|
80 | 80 | $ hg pull --rebase |
|
81 |
pulling from |
|
|
81 | pulling from $TESTTMP/a | |
|
82 | 82 | searching for changes |
|
83 | 83 | adding changesets |
|
84 | 84 | adding manifests |
@@ -94,7 +94,7 b' Invoke pull --rebase and nothing to reba' | |||
|
94 | 94 | pull --rebase --update should ignore --update: |
|
95 | 95 | |
|
96 | 96 | $ hg pull --rebase --update |
|
97 |
pulling from |
|
|
97 | pulling from $TESTTMP/a | |
|
98 | 98 | searching for changes |
|
99 | 99 | no changes found |
|
100 | 100 | |
@@ -103,7 +103,7 b" pull --rebase doesn't update if nothing " | |||
|
103 | 103 | $ hg up -q 1 |
|
104 | 104 | |
|
105 | 105 | $ hg pull --rebase |
|
106 |
pulling from |
|
|
106 | pulling from $TESTTMP/a | |
|
107 | 107 | searching for changes |
|
108 | 108 | no changes found |
|
109 | 109 |
@@ -46,7 +46,7 b' Rename is tracked:' | |||
|
46 | 46 | Rebase the revision containing the rename: |
|
47 | 47 | |
|
48 | 48 | $ hg rebase -s 2 -d 1 |
|
49 |
saved backup bundle to |
|
|
49 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | |
|
50 | 50 | |
|
51 | 51 | $ hg tglog |
|
52 | 52 | @ 2: 'rename A' |
@@ -102,7 +102,7 b' Copy is tracked:' | |||
|
102 | 102 | Rebase the revision containing the copy: |
|
103 | 103 | |
|
104 | 104 | $ hg rebase -s 2 -d 1 |
|
105 |
saved backup bundle to |
|
|
105 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) | |
|
106 | 106 | |
|
107 | 107 | $ hg tglog |
|
108 | 108 | @ 2: 'copy A' |
@@ -69,7 +69,7 b' B onto F - simple rebase:' | |||
|
69 | 69 | o 0: 'A' |
|
70 | 70 | |
|
71 | 71 | $ hg rebase -s 1 -d 5 |
|
72 |
saved backup bundle to |
|
|
72 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | |
|
73 | 73 | |
|
74 | 74 | $ hg tglog |
|
75 | 75 | @ 5: 'B' |
@@ -93,7 +93,7 b' B onto D - intermediate point:' | |||
|
93 | 93 | $ cd a2 |
|
94 | 94 | |
|
95 | 95 | $ hg rebase -s 1 -d 3 |
|
96 |
saved backup bundle to |
|
|
96 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) | |
|
97 | 97 | |
|
98 | 98 | $ hg tglog |
|
99 | 99 | @ 5: 'B' |
@@ -117,7 +117,7 b' C onto F - skip of E:' | |||
|
117 | 117 | $ cd a3 |
|
118 | 118 | |
|
119 | 119 | $ hg rebase -s 2 -d 5 |
|
120 |
saved backup bundle to |
|
|
120 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) | |
|
121 | 121 | |
|
122 | 122 | $ hg tglog |
|
123 | 123 | @ 4: 'C' |
@@ -139,7 +139,7 b' D onto C - rebase of a branching point (' | |||
|
139 | 139 | $ cd a4 |
|
140 | 140 | |
|
141 | 141 | $ hg rebase -s 3 -d 2 |
|
142 |
saved backup bundle to |
|
|
142 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) | |
|
143 | 143 | |
|
144 | 144 | $ hg tglog |
|
145 | 145 | @ 4: 'F' |
@@ -161,7 +161,7 b' E onto F - merged revision having a pare' | |||
|
161 | 161 | $ cd a5 |
|
162 | 162 | |
|
163 | 163 | $ hg rebase -s 4 -d 5 |
|
164 |
saved backup bundle to |
|
|
164 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) | |
|
165 | 165 | |
|
166 | 166 | $ hg tglog |
|
167 | 167 | @ 5: 'E' |
@@ -185,7 +185,7 b' D onto B - E maintains C as parent:' | |||
|
185 | 185 | $ cd a6 |
|
186 | 186 | |
|
187 | 187 | $ hg rebase -s 3 -d 1 |
|
188 |
saved backup bundle to |
|
|
188 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) | |
|
189 | 189 | |
|
190 | 190 | $ hg tglog |
|
191 | 191 | @ 5: 'F' |
@@ -60,7 +60,7 b' clone and pull to break links' | |||
|
60 | 60 | relink |
|
61 | 61 | |
|
62 | 62 | $ hg relink --debug | fix_path |
|
63 | relinking */.hg/store (glob) | |
|
63 | relinking $TESTTMP/repo/.hg/store to $TESTTMP/clone/.hg/store | |
|
64 | 64 | tip has 2 files, estimated total number of files: 3 |
|
65 | 65 | collecting: 00changelog.i 1/3 files (33.33%) |
|
66 | 66 | collecting: 00manifest.i 2/3 files (66.67%) |
@@ -26,7 +26,7 b" share shouldn't have a store dir" | |||
|
26 | 26 | Some sed versions appends newline, some don't, and some just fails |
|
27 | 27 | |
|
28 | 28 | $ cat .hg/sharedpath; echo |
|
29 |
|
|
|
29 | $TESTTMP/repo1/.hg | |
|
30 | 30 | |
|
31 | 31 | commit in shared clone |
|
32 | 32 |
@@ -144,7 +144,7 b' find incoming on the remote side' | |||
|
144 | 144 | find incoming on the remote side (using absolute path) |
|
145 | 145 | |
|
146 | 146 | $ hg incoming -R ../remote -e "python ../dummyssh" "ssh://user@dummy/`pwd`" |
|
147 |
comparing with ssh://user@dummy/ |
|
|
147 | comparing with ssh://user@dummy/$TESTTMP/local | |
|
148 | 148 | searching for changes |
|
149 | 149 | changeset: 1:a28a9d1a809c |
|
150 | 150 | tag: tip |
@@ -220,13 +220,13 b' push should succeed even though it has a' | |||
|
220 | 220 | $ cd .. |
|
221 | 221 | $ cat dummylog |
|
222 | 222 | Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio |
|
223 |
Got arguments 1:user@dummy 2:hg -R |
|
|
223 | Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio | |
|
224 | 224 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
225 | 225 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
226 | 226 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
227 | 227 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
228 | 228 | Got arguments 1:user@dummy 2:hg -R local serve --stdio |
|
229 |
Got arguments 1:user@dummy 2:hg -R |
|
|
229 | Got arguments 1:user@dummy 2:hg -R $TESTTMP/local serve --stdio | |
|
230 | 230 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
231 | 231 | changegroup-in-remote hook: HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 |
|
232 | 232 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
@@ -1,6 +1,5 b'' | |||
|
1 | 1 | test stripping of filelogs where the linkrev doesn't always increase |
|
2 | 2 | |
|
3 | $ . $TESTDIR/helpers.sh | |
|
4 | 3 | $ echo '[extensions]' >> $HGRCPATH |
|
5 | 4 | $ echo 'hgext.mq =' >> $HGRCPATH |
|
6 | 5 | $ hg init orig |
@@ -90,13 +89,13 b' 2 1 0 2 0 1 2' | |||
|
90 | 89 | $ for i in 0 1 2 3 4; do |
|
91 | 90 | > hg clone -q -U --pull crossed $i |
|
92 | 91 | > echo "% Trying to strip revision $i" |
|
93 |
> hg --cwd $i strip $i |
|
|
92 | > hg --cwd $i strip $i | |
|
94 | 93 | > echo "% Verifying" |
|
95 | 94 | > hg --cwd $i verify |
|
96 | 95 | > echo |
|
97 | 96 | > done |
|
98 | 97 | % Trying to strip revision 0 |
|
99 | saved backup bundle to | |
|
98 | saved backup bundle to $TESTTMP/0/.hg/strip-backup/*-backup.hg (glob) | |
|
100 | 99 | % Verifying |
|
101 | 100 | checking changesets |
|
102 | 101 | checking manifests |
@@ -105,7 +104,7 b' 2 1 0 2 0 1 2' | |||
|
105 | 104 | 7 files, 4 changesets, 15 total revisions |
|
106 | 105 | |
|
107 | 106 | % Trying to strip revision 1 |
|
108 | saved backup bundle to | |
|
107 | saved backup bundle to $TESTTMP/1/.hg/strip-backup/*-backup.hg (glob) | |
|
109 | 108 | % Verifying |
|
110 | 109 | checking changesets |
|
111 | 110 | checking manifests |
@@ -114,7 +113,7 b' 2 1 0 2 0 1 2' | |||
|
114 | 113 | 7 files, 4 changesets, 14 total revisions |
|
115 | 114 | |
|
116 | 115 | % Trying to strip revision 2 |
|
117 | saved backup bundle to | |
|
116 | saved backup bundle to $TESTTMP/2/.hg/strip-backup/*-backup.hg (glob) | |
|
118 | 117 | % Verifying |
|
119 | 118 | checking changesets |
|
120 | 119 | checking manifests |
@@ -123,7 +122,7 b' 2 1 0 2 0 1 2' | |||
|
123 | 122 | 7 files, 4 changesets, 14 total revisions |
|
124 | 123 | |
|
125 | 124 | % Trying to strip revision 3 |
|
126 | saved backup bundle to | |
|
125 | saved backup bundle to $TESTTMP/3/.hg/strip-backup/*-backup.hg (glob) | |
|
127 | 126 | % Verifying |
|
128 | 127 | checking changesets |
|
129 | 128 | checking manifests |
@@ -132,7 +131,7 b' 2 1 0 2 0 1 2' | |||
|
132 | 131 | 7 files, 4 changesets, 19 total revisions |
|
133 | 132 | |
|
134 | 133 | % Trying to strip revision 4 |
|
135 | saved backup bundle to | |
|
134 | saved backup bundle to $TESTTMP/4/.hg/strip-backup/*-backup.hg (glob) | |
|
136 | 135 | % Verifying |
|
137 | 136 | checking changesets |
|
138 | 137 | checking manifests |
@@ -27,7 +27,7 b" Preparing the 'main' repo which depends " | |||
|
27 | 27 | $ echo "sub1 = ../sub1" > main/.hgsub |
|
28 | 28 | $ hg clone sub1 main/sub1 |
|
29 | 29 | updating to branch default |
|
30 |
pulling subrepo sub2 from |
|
|
30 | pulling subrepo sub2 from $TESTTMP/sub2 | |
|
31 | 31 | requesting all changes |
|
32 | 32 | adding changesets |
|
33 | 33 | adding manifests |
@@ -55,13 +55,13 b' Clone main' | |||
|
55 | 55 | |
|
56 | 56 | $ hg clone main cloned |
|
57 | 57 | updating to branch default |
|
58 |
pulling subrepo sub1 from |
|
|
58 | pulling subrepo sub1 from $TESTTMP/sub1 | |
|
59 | 59 | requesting all changes |
|
60 | 60 | adding changesets |
|
61 | 61 | adding manifests |
|
62 | 62 | adding file changes |
|
63 | 63 | added 1 changesets with 3 changes to 3 files |
|
64 |
pulling subrepo sub1/sub2 from |
|
|
64 | pulling subrepo sub1/sub2 from $TESTTMP/sub2 | |
|
65 | 65 | requesting all changes |
|
66 | 66 | adding changesets |
|
67 | 67 | adding manifests |
@@ -28,5 +28,5 b' test bad subpaths pattern' | |||
|
28 | 28 | > .* = \1 |
|
29 | 29 | > EOF |
|
30 | 30 | $ hg debugsub |
|
31 |
abort: bad subrepository pattern in |
|
|
31 | abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference | |
|
32 | 32 | [255] |
@@ -246,13 +246,13 b' Clone and test outgoing:' | |||
|
246 | 246 | $ cd .. |
|
247 | 247 | $ hg clone repo repo2 |
|
248 | 248 | updating to branch default |
|
249 |
pulling subrepo foo from |
|
|
249 | pulling subrepo foo from $TESTTMP/repo/foo | |
|
250 | 250 | requesting all changes |
|
251 | 251 | adding changesets |
|
252 | 252 | adding manifests |
|
253 | 253 | adding file changes |
|
254 | 254 | added 4 changesets with 7 changes to 3 files |
|
255 |
pulling subrepo foo/bar from |
|
|
255 | pulling subrepo foo/bar from $TESTTMP/repo/foo/bar | |
|
256 | 256 | requesting all changes |
|
257 | 257 | adding changesets |
|
258 | 258 | adding manifests |
@@ -261,13 +261,13 b' Clone and test outgoing:' | |||
|
261 | 261 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
262 | 262 | $ cd repo2 |
|
263 | 263 | $ hg outgoing -S |
|
264 |
comparing with |
|
|
264 | comparing with $TESTTMP/repo | |
|
265 | 265 | searching for changes |
|
266 | 266 | no changes found |
|
267 |
comparing with |
|
|
267 | comparing with $TESTTMP/repo/foo | |
|
268 | 268 | searching for changes |
|
269 | 269 | no changes found |
|
270 |
comparing with |
|
|
270 | comparing with $TESTTMP/repo/foo/bar | |
|
271 | 271 | searching for changes |
|
272 | 272 | no changes found |
|
273 | 273 | [1] |
@@ -287,7 +287,7 b' Make nested change:' | |||
|
287 | 287 | $ hg commit -m 3-4-2 |
|
288 | 288 | committing subrepository foo |
|
289 | 289 | $ hg outgoing -S |
|
290 |
comparing with |
|
|
290 | comparing with $TESTTMP/repo | |
|
291 | 291 | searching for changes |
|
292 | 292 | changeset: 3:2655b8ecc4ee |
|
293 | 293 | tag: tip |
@@ -295,7 +295,7 b' Make nested change:' | |||
|
295 | 295 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
296 | 296 | summary: 3-4-2 |
|
297 | 297 | |
|
298 |
comparing with |
|
|
298 | comparing with $TESTTMP/repo/foo | |
|
299 | 299 | searching for changes |
|
300 | 300 | changeset: 4:e96193d6cb36 |
|
301 | 301 | tag: tip |
@@ -303,7 +303,7 b' Make nested change:' | |||
|
303 | 303 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
304 | 304 | summary: 3-4-2 |
|
305 | 305 | |
|
306 |
comparing with |
|
|
306 | comparing with $TESTTMP/repo/foo/bar | |
|
307 | 307 | searching for changes |
|
308 | 308 | no changes found |
|
309 | 309 | |
@@ -317,7 +317,7 b' Switch to original repo and setup defaul' | |||
|
317 | 317 | Test incoming: |
|
318 | 318 | |
|
319 | 319 | $ hg incoming -S |
|
320 |
comparing with |
|
|
320 | comparing with $TESTTMP/repo2 | |
|
321 | 321 | searching for changes |
|
322 | 322 | changeset: 3:2655b8ecc4ee |
|
323 | 323 | tag: tip |
@@ -325,7 +325,7 b' Test incoming:' | |||
|
325 | 325 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
326 | 326 | summary: 3-4-2 |
|
327 | 327 | |
|
328 |
comparing with |
|
|
328 | comparing with $TESTTMP/repo2/foo | |
|
329 | 329 | searching for changes |
|
330 | 330 | changeset: 4:e96193d6cb36 |
|
331 | 331 | tag: tip |
@@ -333,7 +333,7 b' Test incoming:' | |||
|
333 | 333 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
334 | 334 | summary: 3-4-2 |
|
335 | 335 | |
|
336 |
comparing with |
|
|
336 | comparing with $TESTTMP/repo2/foo/bar | |
|
337 | 337 | searching for changes |
|
338 | 338 | no changes found |
|
339 | 339 |
@@ -73,7 +73,7 b' debugsub' | |||
|
73 | 73 | |
|
74 | 74 | $ hg debugsub |
|
75 | 75 | path s |
|
76 |
source file:// |
|
|
76 | source file://$TESTTMP/svn-repo/src | |
|
77 | 77 | revision 2 |
|
78 | 78 | |
|
79 | 79 | change file in svn and hg, commit |
@@ -86,13 +86,13 b' change file in svn and hg, commit' | |||
|
86 | 86 | Transmitting file data . |
|
87 | 87 | Committed revision 3. |
|
88 | 88 | |
|
89 |
Fetching external item into ' |
|
|
89 | Fetching external item into '$TESTTMP/sub/t/s/externals' | |
|
90 | 90 | External at revision 1. |
|
91 | 91 | |
|
92 | 92 | At revision 3. |
|
93 | 93 | $ hg debugsub |
|
94 | 94 | path s |
|
95 |
source file:// |
|
|
95 | source file://$TESTTMP/svn-repo/src | |
|
96 | 96 | revision 3 |
|
97 | 97 | |
|
98 | 98 | $ echo a > s/a |
@@ -192,7 +192,7 b' debugsub in clone' | |||
|
192 | 192 | |
|
193 | 193 | $ hg debugsub |
|
194 | 194 | path s |
|
195 |
source file:// |
|
|
195 | source file://$TESTTMP/svn-repo/src | |
|
196 | 196 | revision 3 |
|
197 | 197 | |
|
198 | 198 | verify subrepo is contained within the repo directory |
@@ -236,19 +236,19 b' clone' | |||
|
236 | 236 | $ cd .. |
|
237 | 237 | $ hg clone t tc |
|
238 | 238 | updating to branch default |
|
239 |
pulling subrepo s from |
|
|
239 | pulling subrepo s from $TESTTMP/sub/t/s | |
|
240 | 240 | requesting all changes |
|
241 | 241 | adding changesets |
|
242 | 242 | adding manifests |
|
243 | 243 | adding file changes |
|
244 | 244 | added 4 changesets with 5 changes to 3 files |
|
245 |
pulling subrepo s/ss from |
|
|
245 | pulling subrepo s/ss from $TESTTMP/sub/t/s/ss | |
|
246 | 246 | requesting all changes |
|
247 | 247 | adding changesets |
|
248 | 248 | adding manifests |
|
249 | 249 | adding file changes |
|
250 | 250 | added 1 changesets with 1 changes to 1 files |
|
251 |
pulling subrepo t from |
|
|
251 | pulling subrepo t from $TESTTMP/sub/t/t | |
|
252 | 252 | requesting all changes |
|
253 | 253 | adding changesets |
|
254 | 254 | adding manifests |
@@ -270,14 +270,14 b' push' | |||
|
270 | 270 | $ hg ci -m11 |
|
271 | 271 | committing subrepository t |
|
272 | 272 | $ hg push |
|
273 |
pushing |
|
|
274 | pushing *sub/t/s/ss (glob) | |
|
273 | pushing to $TESTTMP/sub/t | |
|
274 | pushing subrepo s/ss to $TESTTMP/sub/t/s/ss | |
|
275 | 275 | searching for changes |
|
276 | 276 | no changes found |
|
277 | pushing *sub/t/s (glob) | |
|
277 | pushing subrepo s to $TESTTMP/sub/t/s | |
|
278 | 278 | searching for changes |
|
279 | 279 | no changes found |
|
280 | pushing *sub/t/t (glob) | |
|
280 | pushing subrepo t to $TESTTMP/sub/t/t | |
|
281 | 281 | searching for changes |
|
282 | 282 | adding changesets |
|
283 | 283 | adding manifests |
@@ -295,27 +295,27 b' push -f' | |||
|
295 | 295 | $ hg ci -m12 |
|
296 | 296 | committing subrepository s |
|
297 | 297 | $ hg push |
|
298 |
pushing |
|
|
299 | pushing *sub/t/s/ss (glob) | |
|
298 | pushing to $TESTTMP/sub/t | |
|
299 | pushing subrepo s/ss to $TESTTMP/sub/t/s/ss | |
|
300 | 300 | searching for changes |
|
301 | 301 | no changes found |
|
302 | pushing *sub/t/s (glob) | |
|
302 | pushing subrepo s to $TESTTMP/sub/t/s | |
|
303 | 303 | searching for changes |
|
304 | 304 | abort: push creates new remote heads on branch 'default'! |
|
305 | 305 | (did you forget to merge? use push -f to force) |
|
306 | 306 | [255] |
|
307 | 307 | $ hg push -f |
|
308 |
pushing |
|
|
309 | pushing *sub/t/s/ss (glob) | |
|
308 | pushing to $TESTTMP/sub/t | |
|
309 | pushing subrepo s/ss to $TESTTMP/sub/t/s/ss | |
|
310 | 310 | searching for changes |
|
311 | 311 | no changes found |
|
312 | pushing *sub/t/s (glob) | |
|
312 | pushing subrepo s to $TESTTMP/sub/t/s | |
|
313 | 313 | searching for changes |
|
314 | 314 | adding changesets |
|
315 | 315 | adding manifests |
|
316 | 316 | adding file changes |
|
317 | 317 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
318 | pushing *sub/t/t (glob) | |
|
318 | pushing subrepo t to $TESTTMP/sub/t/t | |
|
319 | 319 | searching for changes |
|
320 | 320 | no changes found |
|
321 | 321 | searching for changes |
@@ -337,7 +337,7 b' pull' | |||
|
337 | 337 | |
|
338 | 338 | $ cd ../tc |
|
339 | 339 | $ hg pull |
|
340 | pulling *sub/t (glob) | |
|
340 | pulling from $TESTTMP/sub/t | |
|
341 | 341 | searching for changes |
|
342 | 342 | adding changesets |
|
343 | 343 | adding manifests |
@@ -348,7 +348,7 b' pull' | |||
|
348 | 348 | should pull t |
|
349 | 349 | |
|
350 | 350 | $ hg up |
|
351 |
pulling subrepo t from |
|
|
351 | pulling subrepo t from $TESTTMP/sub/t/t | |
|
352 | 352 | searching for changes |
|
353 | 353 | adding changesets |
|
354 | 354 | adding manifests |
@@ -542,9 +542,9 b' test repository cloning' | |||
|
542 | 542 | $ cat mercurial2/main/nested_absolute/.hg/hgrc \ |
|
543 | 543 | > mercurial2/main/nested_relative/.hg/hgrc |
|
544 | 544 | [paths] |
|
545 |
default = |
|
|
545 | default = $TESTTMP/sub/mercurial/nested_absolute | |
|
546 | 546 | [paths] |
|
547 |
default = |
|
|
547 | default = $TESTTMP/sub/mercurial/nested_relative | |
|
548 | 548 | $ rm -rf mercurial mercurial2 |
|
549 | 549 | |
|
550 | 550 | Issue1977: multirepo push should fail if subrepo push fails |
@@ -560,7 +560,7 b' Issue1977: multirepo push should fail if' | |||
|
560 | 560 | committing subrepository s |
|
561 | 561 | $ hg clone repo repo2 |
|
562 | 562 | updating to branch default |
|
563 |
pulling subrepo s from |
|
|
563 | pulling subrepo s from $TESTTMP/sub/repo/s | |
|
564 | 564 | requesting all changes |
|
565 | 565 | adding changesets |
|
566 | 566 | adding manifests |
@@ -299,7 +299,7 b" Don't allow moving tag without -f:" | |||
|
299 | 299 | Strip 1: expose an old head: |
|
300 | 300 | |
|
301 | 301 | $ hg --config extensions.mq= strip 5 |
|
302 | saved backup bundle to * (glob) | |
|
302 | saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob) | |
|
303 | 303 | $ hg tags # partly stale cache |
|
304 | 304 | tip 5:735c3ca72986 |
|
305 | 305 | bar 1:78391a272241 |
@@ -310,7 +310,7 b' Strip 1: expose an old head:' | |||
|
310 | 310 | Strip 2: destroy whole branch, no old head exposed |
|
311 | 311 | |
|
312 | 312 | $ hg --config extensions.mq= strip 4 |
|
313 | saved backup bundle to * (glob) | |
|
313 | saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob) | |
|
314 | 314 | $ hg tags # partly stale |
|
315 | 315 | tip 4:735c3ca72986 |
|
316 | 316 | bar 0:bbd179dfa0a7 |
General Comments 0
You need to be logged in to leave comments.
Login now