##// END OF EJS Templates
test-subrepo-git.t: silence git output...
Eric Eisner -
r13091:8cecea38 default
parent child Browse files
Show More
@@ -43,16 +43,13 b' add subrepo clone'
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 -b testing
46 $ git checkout -q -b testing
47 Switched to a new branch 'testing'
48 $ echo gg >> g
47 $ echo gg >> g
49 $ git commit -q -a -m gg
48 $ git commit -q -a -m gg
50
49
51 $ cd ../t/s
50 $ cd ../t/s
52 $ git pull -q
51 $ git pull -q >/dev/null 2>/dev/null
53 $ git checkout -b testing origin/testing
52 $ git checkout -q -b testing origin/testing >/dev/null
54 Switched to a new branch 'testing'
55 Branch testing set up to track remote branch testing from origin.
56
53
57 $ cd ..
54 $ cd ..
58 $ hg commit -m 'update git subrepo'
55 $ hg commit -m 'update git subrepo'
@@ -76,8 +73,7 b' clone root'
76
73
77 update to previous substate
74 update to previous substate
78
75
79 $ hg update 1
76 $ hg update 1 2>/dev/null
80 Switched to a new branch 'master'
81 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
77 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
82 $ cat s/g
78 $ cat s/g
83 g
79 g
@@ -132,7 +128,7 b' clone root separately, make different lo'
132
128
133 user b push changes
129 user b push changes
134
130
135 $ hg push
131 $ hg push 2>/dev/null
136 pushing to $TESTTMP/t
132 pushing to $TESTTMP/t
137 pushing branch testing of subrepo s
133 pushing branch testing of subrepo s
138 searching for changes
134 searching for changes
@@ -152,8 +148,7 b' user a pulls, merges, commits'
152 adding file changes
148 adding file changes
153 added 1 changesets with 1 changes to 1 files (+1 heads)
149 added 1 changesets with 1 changes to 1 files (+1 heads)
154 (run 'hg heads' to see heads, 'hg merge' to merge)
150 (run 'hg heads' to see heads, 'hg merge' to merge)
155 $ hg merge
151 $ hg merge 2>/dev/null
156 Automatic merge went well; stopped before committing as requested
157 pulling subrepo s
152 pulling subrepo s
158 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
153 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
159 (branch merge, don't forget to commit)
154 (branch merge, don't forget to commit)
@@ -169,7 +164,7 b' user a pulls, merges, commits'
169 path s
164 path s
170 source ../gitroot
165 source ../gitroot
171 revision f47b465e1bce645dbf37232a00574aa1546ca8d3
166 revision f47b465e1bce645dbf37232a00574aa1546ca8d3
172 $ hg push
167 $ hg push 2>/dev/null
173 pushing to $TESTTMP/t
168 pushing to $TESTTMP/t
174 pushing branch testing of subrepo s
169 pushing branch testing of subrepo s
175 searching for changes
170 searching for changes
@@ -187,7 +182,7 b' make upstream git changes'
187 $ git commit -q -a -m ff
182 $ git commit -q -a -m ff
188 $ echo fff >> f
183 $ echo fff >> f
189 $ git commit -q -a -m fff
184 $ git commit -q -a -m fff
190 $ git push -q origin testing
185 $ git push origin testing 2>/dev/null
191
186
192 make and push changes to hg without updating the subrepo
187 make and push changes to hg without updating the subrepo
193
188
@@ -214,7 +209,7 b' sync to upstream git, distribute changes'
214 $ cd ../ta
209 $ cd ../ta
215 $ hg pull -u -q
210 $ hg pull -u -q
216 $ cd s
211 $ cd s
217 $ git pull -q
212 $ git pull -q >/dev/null 2>/dev/null
218 $ cd ..
213 $ cd ..
219 $ hg commit -m 'git upstream sync'
214 $ hg commit -m 'git upstream sync'
220 committing subrepository $TESTTMP/ta/s
215 committing subrepository $TESTTMP/ta/s
@@ -226,7 +221,7 b' sync to upstream git, distribute changes'
226
221
227 $ cd ../tb
222 $ cd ../tb
228 $ hg pull -q
223 $ hg pull -q
229 $ hg update
224 $ hg update 2>/dev/null
230 pulling subrepo s
225 pulling subrepo s
231 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
226 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
232 $ hg debugsub
227 $ hg debugsub
@@ -254,8 +249,9 b' update to a revision without the subrepo'
254
249
255 archive subrepos
250 archive subrepos
256
251
257 $ cd ../t
252 $ cd ../tc
258 $ hg archive --subrepos -r 5 ../archive
253 $ hg pull -q
254 $ hg archive --subrepos -r 5 ../archive 2>/dev/null
259 pulling subrepo s
255 pulling subrepo s
260 $ cd ../archive
256 $ cd ../archive
261 $ cat s/f
257 $ cat s/f
General Comments 0
You need to be logged in to leave comments. Login now