##// END OF EJS Templates
subrepo: add regression test for issue3870
Kevin Bullock -
r19013:2b34d004 default
parent child Browse files
Show More
@@ -238,6 +238,31 b' sync to upstream git, distribute changes'
238 source ../gitroot
238 source ../gitroot
239 revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc
239 revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc
240
240
241 create a new git branch
242
243 $ cd s
244 $ git checkout -b b2
245 Switched to a new branch 'b2'
246 $ echo a>a
247 $ git add a
248 $ git commit -qm 'add a'
249 $ cd ..
250 $ hg commit -m 'add branch in s'
251
252 pulling new git branch should not create tracking branch named 'origin/b2'
253 (issue3870)
254 $ cd ../td/s
255 $ git remote set-url origin $TESTTMP/tb/s
256 $ cd ..
257 $ hg pull -q ../tb
258 $ hg up
259 From $TESTTMP/tb/s
260 * [new branch] b2 -> origin/b2
261 Previous HEAD position was f47b465... merge
262 Switched to a new branch 'b2'
263 pulling subrepo s from $TESTTMP/tb/s
264 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
265
241 update to a revision without the subrepo, keeping the local git repository
266 update to a revision without the subrepo, keeping the local git repository
242
267
243 $ cd ../t
268 $ cd ../t
General Comments 0
You need to be logged in to leave comments. Login now