Mercurial > hg

comparison tests/test-subrepo-svn.t @ 23048:ee5f834077be stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default into stable for 3.2 freeze
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Oct 2014 18:04:31 -0500
parents c63a09b6b337
children 8f02682ff3b0
comparison
equal deleted inserted replaced
22843:b6531d806de8 23048:ee5f834077be
1 $ "$TESTDIR/hghave" svn15 || exit 80 1 #require svn15
2 2
3 $ SVNREPOPATH=`pwd`/svn-repo 3 $ SVNREPOPATH=`pwd`/svn-repo
4 #if windows 4 #if windows
5 $ SVNREPOURL=file:///`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"` 5 $ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
6 #else 6 #else
7 $ SVNREPOURL=file://`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"` 7 $ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
8 #endif 8 #endif
9 9
10 create subversion repo 10 create subversion repo
11 11
12 $ WCROOT="`pwd`/svn-wc" 12 $ WCROOT="`pwd`/svn-wc"
240 source file://*/svn-repo/src (glob) 240 source file://*/svn-repo/src (glob)
241 revision 2 241 revision 2
242 242
243 verify subrepo is contained within the repo directory 243 verify subrepo is contained within the repo directory
244 244
245 $ python -c "import os.path; print os.path.exists('s')" 245 $ $PYTHON -c "import os.path; print os.path.exists('s')"
246 True 246 True
247 247
248 update to nullrev (must delete the subrepo) 248 update to nullrev (must delete the subrepo)
249 249
250 $ hg up null 250 $ hg up null
320 $ cd .. 320 $ cd ..
321 $ hg update tip 321 $ hg update tip
322 subrepository s diverged (local revision: 2, remote revision: 3) 322 subrepository s diverged (local revision: 2, remote revision: 3)
323 (M)erge, keep (l)ocal or keep (r)emote? m 323 (M)erge, keep (l)ocal or keep (r)emote? m
324 subrepository sources for s differ 324 subrepository sources for s differ
325 use (l)ocal source (2) or (r)emote source (3)? 325 use (l)ocal source (2) or (r)emote source (3)? l
326 l
327 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 326 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
328 $ hg id -n 327 $ hg id -n
329 2+ 328 2+
330 $ cd s 329 $ cd s
331 $ svnversion 330 $ svnversion
352 $ cd .. 351 $ cd ..
353 $ hg update 1 352 $ hg update 1
354 subrepository s diverged (local revision: 3, remote revision: 2) 353 subrepository s diverged (local revision: 3, remote revision: 2)
355 (M)erge, keep (l)ocal or keep (r)emote? m 354 (M)erge, keep (l)ocal or keep (r)emote? m
356 subrepository sources for s differ (in checked out version) 355 subrepository sources for s differ (in checked out version)
357 use (l)ocal source (1) or (r)emote source (2)? 356 use (l)ocal source (1) or (r)emote source (2)? l
358 l
359 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 357 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
360 $ hg id -n 358 $ hg id -n
361 1+ 359 1+
362 $ cd s 360 $ cd s
363 $ svnversion 361 $ svnversion
376 1+ 374 1+
377 $ hg update tip 375 $ hg update tip
378 subrepository s diverged (local revision: 3, remote revision: 3) 376 subrepository s diverged (local revision: 3, remote revision: 3)
379 (M)erge, keep (l)ocal or keep (r)emote? m 377 (M)erge, keep (l)ocal or keep (r)emote? m
380 subrepository sources for s differ 378 subrepository sources for s differ
381 use (l)ocal source (1) or (r)emote source (3)? 379 use (l)ocal source (1) or (r)emote source (3)? l
382 l
383 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 380 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
384 $ hg id -n 381 $ hg id -n
385 2+ 382 2+
386 $ cd s 383 $ cd s
387 $ svnversion 384 $ svnversion