Show More
@@ -1,306 +1,306 b'' | |||||
1 | $ "$TESTDIR/hghave" git || exit 80 |
|
1 | $ "$TESTDIR/hghave" git || exit 80 | |
2 |
|
2 | |||
3 | make git commits repeatable |
|
3 | make git commits repeatable | |
4 |
|
4 | |||
5 | $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME |
|
5 | $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME | |
6 | $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL |
|
6 | $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL | |
7 | $ GIT_AUTHOR_DATE='1234567891 +0000'; export GIT_AUTHOR_DATE |
|
7 | $ GIT_AUTHOR_DATE='1234567891 +0000'; export GIT_AUTHOR_DATE | |
8 | $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME |
|
8 | $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME | |
9 | $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL |
|
9 | $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL | |
10 | $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE |
|
10 | $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE | |
11 |
|
11 | |||
12 | root hg repo |
|
12 | root hg repo | |
13 |
|
13 | |||
14 | $ hg init t |
|
14 | $ hg init t | |
15 | $ cd t |
|
15 | $ cd t | |
16 | $ echo a > a |
|
16 | $ echo a > a | |
17 | $ hg add a |
|
17 | $ hg add a | |
18 | $ hg commit -m a |
|
18 | $ hg commit -m a | |
19 | $ cd .. |
|
19 | $ cd .. | |
20 |
|
20 | |||
21 | new external git repo |
|
21 | new external git repo | |
22 |
|
22 | |||
23 | $ mkdir gitroot |
|
23 | $ mkdir gitroot | |
24 | $ cd gitroot |
|
24 | $ cd gitroot | |
25 | $ git init -q |
|
25 | $ git init -q | |
26 | $ echo g > g |
|
26 | $ echo g > g | |
27 | $ git add g |
|
27 | $ git add g | |
28 | $ git commit -q -m g |
|
28 | $ git commit -q -m g | |
29 |
|
29 | |||
30 | add subrepo clone |
|
30 | add subrepo clone | |
31 |
|
31 | |||
32 | $ cd ../t |
|
32 | $ cd ../t | |
33 | $ echo 's = [git]../gitroot' > .hgsub |
|
33 | $ echo 's = [git]../gitroot' > .hgsub | |
34 | $ git clone -q ../gitroot s |
|
34 | $ git clone -q ../gitroot s | |
35 | $ hg add .hgsub |
|
35 | $ hg add .hgsub | |
36 | $ hg commit -m 'new git subrepo' |
|
36 | $ hg commit -m 'new git subrepo' | |
37 | committing subrepository s |
|
37 | committing subrepository s | |
38 | $ hg debugsub |
|
38 | $ hg debugsub | |
39 | path s |
|
39 | path s | |
40 | source ../gitroot |
|
40 | source ../gitroot | |
41 | revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
|
41 | revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 | |
42 |
|
42 | |||
43 | record a new commit from upstream from a different branch |
|
43 | record a new commit from upstream from a different branch | |
44 |
|
44 | |||
45 | $ cd ../gitroot |
|
45 | $ cd ../gitroot | |
46 | $ git checkout -q -b testing |
|
46 | $ git checkout -q -b testing | |
47 | $ echo gg >> g |
|
47 | $ echo gg >> g | |
48 | $ git commit -q -a -m gg |
|
48 | $ git commit -q -a -m gg | |
49 |
|
49 | |||
50 | $ cd ../t/s |
|
50 | $ cd ../t/s | |
51 | $ git pull -q >/dev/null 2>/dev/null |
|
51 | $ git pull -q >/dev/null 2>/dev/null | |
52 | $ git checkout -q -b testing origin/testing >/dev/null |
|
52 | $ git checkout -q -b testing origin/testing >/dev/null | |
53 |
|
53 | |||
54 | $ cd .. |
|
54 | $ cd .. | |
55 | $ hg status --subrepos |
|
55 | $ hg status --subrepos | |
56 | M s/g |
|
56 | M s/g | |
57 | $ hg commit -m 'update git subrepo' |
|
57 | $ hg commit -m 'update git subrepo' | |
58 | committing subrepository s |
|
58 | committing subrepository s | |
59 | $ hg debugsub |
|
59 | $ hg debugsub | |
60 | path s |
|
60 | path s | |
61 | source ../gitroot |
|
61 | source ../gitroot | |
62 | revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a |
|
62 | revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a | |
63 |
|
63 | |||
64 | make $GITROOT pushable, by replacing it with a clone with nothing checked out |
|
64 | make $GITROOT pushable, by replacing it with a clone with nothing checked out | |
65 |
|
65 | |||
66 | $ cd .. |
|
66 | $ cd .. | |
67 | $ git clone gitroot gitrootbare --bare -q |
|
67 | $ git clone gitroot gitrootbare --bare -q | |
68 | $ rm -rf gitroot |
|
68 | $ rm -rf gitroot | |
69 | $ mv gitrootbare gitroot |
|
69 | $ mv gitrootbare gitroot | |
70 |
|
70 | |||
71 | clone root |
|
71 | clone root | |
72 |
|
72 | |||
73 | $ cd t |
|
73 | $ cd t | |
74 | $ hg clone . ../tc |
|
74 | $ hg clone . ../tc | |
75 | updating to branch default |
|
75 | updating to branch default | |
76 | cloning subrepo s |
|
76 | cloning subrepo s | |
77 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
77 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
78 | $ cd ../tc |
|
78 | $ cd ../tc | |
79 | $ hg debugsub |
|
79 | $ hg debugsub | |
80 | path s |
|
80 | path s | |
81 | source ../gitroot |
|
81 | source ../gitroot | |
82 | revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a |
|
82 | revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a | |
83 |
|
83 | |||
84 | update to previous substate |
|
84 | update to previous substate | |
85 |
|
85 | |||
86 | $ hg update 1 -q |
|
86 | $ hg update 1 -q | |
87 | $ cat s/g |
|
87 | $ cat s/g | |
88 | g |
|
88 | g | |
89 | $ hg debugsub |
|
89 | $ hg debugsub | |
90 | path s |
|
90 | path s | |
91 | source ../gitroot |
|
91 | source ../gitroot | |
92 | revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
|
92 | revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 | |
93 |
|
93 | |||
94 | clone root, make local change |
|
94 | clone root, make local change | |
95 |
|
95 | |||
96 | $ cd ../t |
|
96 | $ cd ../t | |
97 | $ hg clone . ../ta |
|
97 | $ hg clone . ../ta | |
98 | updating to branch default |
|
98 | updating to branch default | |
99 | cloning subrepo s |
|
99 | cloning subrepo s | |
100 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
100 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
101 |
|
101 | |||
102 | $ cd ../ta |
|
102 | $ cd ../ta | |
103 | $ echo ggg >> s/g |
|
103 | $ echo ggg >> s/g | |
104 | $ hg status --subrepos |
|
104 | $ hg status --subrepos | |
105 | M s/g |
|
105 | M s/g | |
106 | $ hg commit -m ggg |
|
106 | $ hg commit -m ggg | |
107 | committing subrepository s |
|
107 | committing subrepository s | |
108 | $ hg debugsub |
|
108 | $ hg debugsub | |
109 | path s |
|
109 | path s | |
110 | source ../gitroot |
|
110 | source ../gitroot | |
111 | revision 79695940086840c99328513acbe35f90fcd55e57 |
|
111 | revision 79695940086840c99328513acbe35f90fcd55e57 | |
112 |
|
112 | |||
113 | clone root separately, make different local change |
|
113 | clone root separately, make different local change | |
114 |
|
114 | |||
115 | $ cd ../t |
|
115 | $ cd ../t | |
116 | $ hg clone . ../tb |
|
116 | $ hg clone . ../tb | |
117 | updating to branch default |
|
117 | updating to branch default | |
118 | cloning subrepo s |
|
118 | cloning subrepo s | |
119 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
119 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
120 |
|
120 | |||
121 | $ cd ../tb/s |
|
121 | $ cd ../tb/s | |
122 | $ echo f > f |
|
122 | $ echo f > f | |
123 | $ git add f |
|
123 | $ git add f | |
124 | $ cd .. |
|
124 | $ cd .. | |
125 |
|
125 | |||
126 | $ hg status --subrepos |
|
126 | $ hg status --subrepos | |
127 | A s/f |
|
127 | A s/f | |
128 | $ hg commit -m f |
|
128 | $ hg commit -m f | |
129 | committing subrepository s |
|
129 | committing subrepository s | |
130 | $ hg debugsub |
|
130 | $ hg debugsub | |
131 | path s |
|
131 | path s | |
132 | source ../gitroot |
|
132 | source ../gitroot | |
133 | revision aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
|
133 | revision aa84837ccfbdfedcdcdeeedc309d73e6eb069edc | |
134 |
|
134 | |||
135 | user b push changes |
|
135 | user b push changes | |
136 |
|
136 | |||
137 | $ hg push 2>/dev/null |
|
137 | $ hg push 2>/dev/null | |
138 | pushing to $TESTTMP/t |
|
138 | pushing to $TESTTMP/t | |
139 | pushing branch testing of subrepo s |
|
139 | pushing branch testing of subrepo s | |
140 | searching for changes |
|
140 | searching for changes | |
141 | adding changesets |
|
141 | adding changesets | |
142 | adding manifests |
|
142 | adding manifests | |
143 | adding file changes |
|
143 | adding file changes | |
144 | added 1 changesets with 1 changes to 1 files |
|
144 | added 1 changesets with 1 changes to 1 files | |
145 |
|
145 | |||
146 | user a pulls, merges, commits |
|
146 | user a pulls, merges, commits | |
147 |
|
147 | |||
148 | $ cd ../ta |
|
148 | $ cd ../ta | |
149 | $ hg pull |
|
149 | $ hg pull | |
150 | pulling from $TESTTMP/t |
|
150 | pulling from $TESTTMP/t | |
151 | searching for changes |
|
151 | searching for changes | |
152 | adding changesets |
|
152 | adding changesets | |
153 | adding manifests |
|
153 | adding manifests | |
154 | adding file changes |
|
154 | adding file changes | |
155 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
155 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
156 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
156 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
157 | $ hg merge 2>/dev/null |
|
157 | $ hg merge 2>/dev/null | |
158 | pulling subrepo s |
|
158 | pulling subrepo s | |
159 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
159 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
160 | (branch merge, don't forget to commit) |
|
160 | (branch merge, don't forget to commit) | |
161 | $ cat s/f |
|
161 | $ cat s/f | |
162 | f |
|
162 | f | |
163 | $ cat s/g |
|
163 | $ cat s/g | |
164 | g |
|
164 | g | |
165 | gg |
|
165 | gg | |
166 | ggg |
|
166 | ggg | |
167 | $ hg commit -m 'merge' |
|
167 | $ hg commit -m 'merge' | |
168 | committing subrepository s |
|
168 | committing subrepository s | |
169 | $ hg status --subrepos --rev 1:5 |
|
169 | $ hg status --subrepos --rev 1:5 | |
170 | M .hgsubstate |
|
170 | M .hgsubstate | |
171 | M s/g |
|
171 | M s/g | |
172 | A s/f |
|
172 | A s/f | |
173 | $ hg debugsub |
|
173 | $ hg debugsub | |
174 | path s |
|
174 | path s | |
175 | source ../gitroot |
|
175 | source ../gitroot | |
176 | revision f47b465e1bce645dbf37232a00574aa1546ca8d3 |
|
176 | revision f47b465e1bce645dbf37232a00574aa1546ca8d3 | |
177 | $ hg push 2>/dev/null |
|
177 | $ hg push 2>/dev/null | |
178 | pushing to $TESTTMP/t |
|
178 | pushing to $TESTTMP/t | |
179 | pushing branch testing of subrepo s |
|
179 | pushing branch testing of subrepo s | |
180 | searching for changes |
|
180 | searching for changes | |
181 | adding changesets |
|
181 | adding changesets | |
182 | adding manifests |
|
182 | adding manifests | |
183 | adding file changes |
|
183 | adding file changes | |
184 | added 2 changesets with 2 changes to 1 files |
|
184 | added 2 changesets with 2 changes to 1 files | |
185 |
|
185 | |||
186 | make upstream git changes |
|
186 | make upstream git changes | |
187 |
|
187 | |||
188 | $ cd .. |
|
188 | $ cd .. | |
189 | $ git clone -q gitroot gitclone |
|
189 | $ git clone -q gitroot gitclone | |
190 | $ cd gitclone |
|
190 | $ cd gitclone | |
191 | $ echo ff >> f |
|
191 | $ echo ff >> f | |
192 | $ git commit -q -a -m ff |
|
192 | $ git commit -q -a -m ff | |
193 | $ echo fff >> f |
|
193 | $ echo fff >> f | |
194 | $ git commit -q -a -m fff |
|
194 | $ git commit -q -a -m fff | |
195 | $ git push origin testing 2>/dev/null |
|
195 | $ git push origin testing 2>/dev/null | |
196 |
|
196 | |||
197 | make and push changes to hg without updating the subrepo |
|
197 | make and push changes to hg without updating the subrepo | |
198 |
|
198 | |||
199 | $ cd ../t |
|
199 | $ cd ../t | |
200 | $ hg clone . ../td |
|
200 | $ hg clone . ../td | |
201 | updating to branch default |
|
201 | updating to branch default | |
202 | cloning subrepo s |
|
202 | cloning subrepo s | |
203 | checking out detached HEAD in subrepo s |
|
203 | checking out detached HEAD in subrepo s | |
204 | check out a git branch if you intend to make changes |
|
204 | check out a git branch if you intend to make changes | |
205 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
205 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
206 | $ cd ../td |
|
206 | $ cd ../td | |
207 | $ echo aa >> a |
|
207 | $ echo aa >> a | |
208 | $ hg commit -m aa |
|
208 | $ hg commit -m aa | |
209 | $ hg push |
|
209 | $ hg push | |
210 | pushing to $TESTTMP/t |
|
210 | pushing to $TESTTMP/t | |
211 | searching for changes |
|
211 | searching for changes | |
212 | adding changesets |
|
212 | adding changesets | |
213 | adding manifests |
|
213 | adding manifests | |
214 | adding file changes |
|
214 | adding file changes | |
215 | added 1 changesets with 1 changes to 1 files |
|
215 | added 1 changesets with 1 changes to 1 files | |
216 |
|
216 | |||
217 | sync to upstream git, distribute changes |
|
217 | sync to upstream git, distribute changes | |
218 |
|
218 | |||
219 | $ cd ../ta |
|
219 | $ cd ../ta | |
220 | $ hg pull -u -q |
|
220 | $ hg pull -u -q | |
221 | $ cd s |
|
221 | $ cd s | |
222 | $ git pull -q >/dev/null 2>/dev/null |
|
222 | $ git pull -q >/dev/null 2>/dev/null | |
223 | $ cd .. |
|
223 | $ cd .. | |
224 | $ hg commit -m 'git upstream sync' |
|
224 | $ hg commit -m 'git upstream sync' | |
225 | committing subrepository s |
|
225 | committing subrepository s | |
226 | $ hg debugsub |
|
226 | $ hg debugsub | |
227 | path s |
|
227 | path s | |
228 | source ../gitroot |
|
228 | source ../gitroot | |
229 | revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
|
229 | revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc | |
230 | $ hg push -q |
|
230 | $ hg push -q | |
231 |
|
231 | |||
232 | $ cd ../tb |
|
232 | $ cd ../tb | |
233 | $ hg pull -q |
|
233 | $ hg pull -q | |
234 | $ hg update 2>/dev/null |
|
234 | $ hg update 2>/dev/null | |
235 | pulling subrepo s |
|
235 | pulling subrepo s | |
236 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
236 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
237 | $ hg debugsub |
|
237 | $ hg debugsub | |
238 | path s |
|
238 | path s | |
239 | source ../gitroot |
|
239 | source ../gitroot | |
240 | revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
|
240 | revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc | |
241 |
|
241 | |||
242 | update to a revision without the subrepo, keeping the local git repository |
|
242 | update to a revision without the subrepo, keeping the local git repository | |
243 |
|
243 | |||
244 | $ cd ../t |
|
244 | $ cd ../t | |
245 | $ hg up 0 |
|
245 | $ hg up 0 | |
246 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
246 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
247 | $ ls -a s |
|
247 | $ ls -a s | |
248 | . |
|
248 | . | |
249 | .. |
|
249 | .. | |
250 | .git |
|
250 | .git | |
251 |
|
251 | |||
252 | $ hg up 2 |
|
252 | $ hg up 2 | |
253 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
253 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
254 | $ ls -a s |
|
254 | $ ls -a s | |
255 | . |
|
255 | . | |
256 | .. |
|
256 | .. | |
257 | .git |
|
257 | .git | |
258 | g |
|
258 | g | |
259 |
|
259 | |||
260 | archive subrepos |
|
260 | archive subrepos | |
261 |
|
261 | |||
262 | $ cd ../tc |
|
262 | $ cd ../tc | |
263 | $ hg pull -q |
|
263 | $ hg pull -q | |
264 | $ hg archive --subrepos -r 5 ../archive 2>/dev/null |
|
264 | $ hg archive --subrepos -r 5 ../archive 2>/dev/null | |
265 | pulling subrepo s |
|
265 | pulling subrepo s | |
266 | $ cd ../archive |
|
266 | $ cd ../archive | |
267 | $ cat s/f |
|
267 | $ cat s/f | |
268 | f |
|
268 | f | |
269 | $ cat s/g |
|
269 | $ cat s/g | |
270 | g |
|
270 | g | |
271 | gg |
|
271 | gg | |
272 | ggg |
|
272 | ggg | |
273 |
|
273 | |||
274 | create nested repo |
|
274 | create nested repo | |
275 |
|
275 | |||
276 | $ cd .. |
|
276 | $ cd .. | |
277 | $ hg init outer |
|
277 | $ hg init outer | |
278 | $ cd outer |
|
278 | $ cd outer | |
279 | $ echo b>b |
|
279 | $ echo b>b | |
280 | $ hg add b |
|
280 | $ hg add b | |
281 | $ hg commit -m b |
|
281 | $ hg commit -m b | |
282 |
|
282 | |||
283 | $ hg clone ../t inner |
|
283 | $ hg clone ../t inner | |
284 | updating to branch default |
|
284 | updating to branch default | |
285 | cloning subrepo s |
|
285 | cloning subrepo s | |
286 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
286 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
287 | $ echo inner = inner > .hgsub |
|
287 | $ echo inner = inner > .hgsub | |
288 | $ hg add .hgsub |
|
288 | $ hg add .hgsub | |
289 | $ hg commit -m 'nested sub' |
|
289 | $ hg commit -m 'nested sub' | |
290 | committing subrepository inner |
|
290 | committing subrepository inner | |
291 |
|
291 | |||
292 | nested commit |
|
292 | nested commit | |
293 |
|
293 | |||
294 | $ echo ffff >> inner/s/f |
|
294 | $ echo ffff >> inner/s/f | |
295 | $ hg status --subrepos |
|
295 | $ hg status --subrepos | |
296 | M inner/s/f |
|
296 | M inner/s/f | |
297 | $ hg commit -m nested |
|
297 | $ hg commit -m nested | |
298 | committing subrepository inner |
|
298 | committing subrepository inner | |
299 | committing subrepository inner/s |
|
299 | committing subrepository inner/s | |
300 |
|
300 | |||
301 | nested archive |
|
301 | nested archive | |
302 |
|
302 | |||
303 | $ hg archive --subrepos ../narchive |
|
303 | $ hg archive --subrepos ../narchive | |
304 | $ ls ../narchive/inner/s |
|
304 | $ ls ../narchive/inner/s | grep -v pax_global_header | |
305 | f |
|
305 | f | |
306 | g |
|
306 | g |
General Comments 0
You need to be logged in to leave comments.
Login now