Mercurial > public > mercurial-scm > hg
diff tests/test-subrepo-svn.t @ 13287:d0e0d3d43e14 stable
subrepo: compare svn subrepo state to last committed revision
A subversion project revisions are a subset of the repository revisions, you
can ask subversion to update a working directory from one revision to another
without changing anything. Unfortunately, Mercurial will think the
subrepository has changed and will commit it again. To avoid useless commits,
we compare the subrepository state to its actual "parent" revision. To ensure
ascending compatibility with existing subrepositories which might reference
fake revisions, we also keep comparing with the subrepo working directory
revision.
NOTE: not sure if this should go in stable or not.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sat, 22 Jan 2011 16:15:40 +0100 |
| parents | 82ca0c43bc44 |
| children | c19b9282d3a7 |
line wrap: on
line diff
--- a/tests/test-subrepo-svn.t Fri Jan 21 14:42:15 2011 -0600 +++ b/tests/test-subrepo-svn.t Sat Jan 22 16:15:40 2011 +0100 @@ -123,6 +123,25 @@ source file://*/svn-repo/src (glob) revision 2 +add an unrelated revision in svn and update the subrepo to without +bringing any changes. + + $ svn mkdir --parents "$SVNREPO/unrelated" -m 'create unrelated' + + Committed revision 4. + $ svn up s + + Fetching external item into 's/externals' + External at revision 1. + + At revision 4. + $ hg sum + parent: 2:* tip (glob) + Message! + branch: default + commit: (clean) + update: (current) + $ echo a > s/a should be empty despite change to s/a @@ -139,14 +158,14 @@ A externals/other Updated external to revision 1. - Updated to revision 3. + Updated to revision 4. $ echo xyz >> alpha $ svn propset svn:mime-type 'text/xml' alpha property 'svn:mime-type' set on 'alpha' $ svn ci -m 'amend a from svn' Sending src/alpha Transmitting file data . - Committed revision 4. + Committed revision 5. $ cd ../../sub/t this commit from hg will fail