Mercurial > hg

comparison tests/test-subrepo @ 11470:34e33d50c26b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: correctly handle update -C with modified subrepos (issue2022) (based on a patch by Saint Germain)
author Matt Mackall <mpm@selenic.com>
date Wed, 30 Jun 2010 23:56:35 -0500
parents c4347e48b0d0
children b602a95c21ec
comparison
equal deleted inserted replaced
11469:c37f35d7f2f5 11470:34e33d50c26b
16 hg init s 16 hg init s
17 echo a > s/a 17 echo a > s/a
18 hg -R s ci -Ams0 18 hg -R s ci -Ams0
19 hg sum 19 hg sum
20 hg ci -m1 20 hg ci -m1
21
22 # issue 2022 - update -C
23
24 echo b > s/a
25 hg sum
26 hg co -C 1
27 hg sum
21 28
22 echo % add sub sub 29 echo % add sub sub
23 echo ss = ss > s/.hgsub 30 echo ss = ss > s/.hgsub
24 hg init s/ss 31 hg init s/ss
25 echo a > s/ss/a 32 echo a > s/ss/a