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