Mercurial > hg > mercurial
changeset 837:58d083742bc4
Fix purge tests: create test data with the oldest supported hg version
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/PurgeTest.java Mon Jun 02 12:41:08 2014 +0200 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/PurgeTest.java Mon Jun 02 14:23:40 2014 +0200 @@ -50,12 +50,12 @@ public void purge_unknown() throws Exception { VcsRoot vcsRoot = vcsRoot().withUrl(myRemoteRepository).withPurgePolicy(HgVcsRoot.PurgePolicy.PURGE_UNKNOWN).build(); - checkout(vcsRoot, "1:80a857d1f74b"); + checkout(vcsRoot, "1:1db20368ddc7"); File unknownFile = createUnknownFile(myWorkDir); File ignoredFile = createIgnoredFile(myWorkDir); - checkout(vcsRoot, "1:80a857d1f74b"); + checkout(vcsRoot, "1:1db20368ddc7"); assertFalse(unknownFile.exists()); assertTrue(ignoredFile.exists()); @@ -64,12 +64,12 @@ public void purge_all() throws Exception { VcsRoot vcsRoot = vcsRoot().withUrl(myRemoteRepository).withPurgePolicy(HgVcsRoot.PurgePolicy.PURGE_ALL).build(); - checkout(vcsRoot, "1:80a857d1f74b"); + checkout(vcsRoot, "1:1db20368ddc7"); File unknownFile = createUnknownFile(myWorkDir); File ignoredFile = createIgnoredFile(myWorkDir); - checkout(vcsRoot, "1:80a857d1f74b"); + checkout(vcsRoot, "1:1db20368ddc7"); assertFalse(unknownFile.exists()); assertFalse(ignoredFile.exists()); @@ -78,14 +78,14 @@ public void purge_unknown_subrepos() throws Exception { VcsRoot vcsRoot = vcsRoot().withUrl(myRemoteRepository).withPurgePolicy(HgVcsRoot.PurgePolicy.PURGE_UNKNOWN).build(); - checkout(vcsRoot, "2:5998f41141bc"); + checkout(vcsRoot, "2:47e24ed2a4a9"); File unknownFile = createUnknownFile(myWorkDir); File ignoredFile = createIgnoredFile(myWorkDir); File unknownFileSubrepo = createUnknownFile(new File(myWorkDir, "self")); File ignoredFileSubrepo = createIgnoredFile(new File(myWorkDir, "self")); - checkout(vcsRoot, "2:5998f41141bc"); + checkout(vcsRoot, "2:47e24ed2a4a9"); assertFalse(unknownFile.exists()); assertFalse(unknownFileSubrepo.exists()); @@ -96,14 +96,14 @@ public void purge_all_subrepos() throws Exception { VcsRoot vcsRoot = vcsRoot().withUrl(myRemoteRepository).withPurgePolicy(HgVcsRoot.PurgePolicy.PURGE_ALL).build(); - checkout(vcsRoot, "2:5998f41141bc"); + checkout(vcsRoot, "2:47e24ed2a4a9"); File unknownFile = createUnknownFile(myWorkDir); File ignoredFile = createIgnoredFile(myWorkDir); File unknownFileSubrepo = createUnknownFile(new File(myWorkDir, "self")); File ignoredFileSubrepo = createIgnoredFile(new File(myWorkDir, "self")); - checkout(vcsRoot, "2:5998f41141bc"); + checkout(vcsRoot, "2:47e24ed2a4a9"); assertFalse(unknownFile.exists()); assertFalse(unknownFileSubrepo.exists());
--- a/mercurial-tests/testData/testPurge/README Mon Jun 02 12:41:08 2014 +0200 +++ b/mercurial-tests/testData/testPurge/README Mon Jun 02 14:23:40 2014 +0200 @@ -1,5 +1,5 @@ -o changeset: 2:5998f41141bc //add same repo as a subrepo at path self +o changeset: 2:47e24ed2a4a9 //add same repo as a subrepo at path self | -o changeset: 1:80a857d1f74b //ignores ignoredFile +o changeset: 1:1db20368ddc7 //ignores ignoredFile | -o changeset: 0:8a9ae2d32de0 //contains file a +o changeset: 0:acefc1a0763c //contains file a
--- a/mercurial-tests/testData/testPurge/hg/branch Mon Jun 02 12:41:08 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -default
--- a/mercurial-tests/testData/testPurge/hg/cache/branchheads-served Mon Jun 02 12:41:08 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -5998f41141bcbe2fa5cd423902ddb75deb5ce4a6 2 -5998f41141bcbe2fa5cd423902ddb75deb5ce4a6 default
--- a/mercurial-tests/testData/testPurge/hg/cache/tags Mon Jun 02 12:41:08 2014 +0200 +++ b/mercurial-tests/testData/testPurge/hg/cache/tags Mon Jun 02 14:23:40 2014 +0200 @@ -1,2 +1,2 @@ -2 5998f41141bcbe2fa5cd423902ddb75deb5ce4a6 +2 47e24ed2a4a91d036e740d4a8bdcd7fd156ed3dc
--- a/mercurial-tests/testData/testPurge/hg/last-message.txt Mon Jun 02 12:41:08 2014 +0200 +++ b/mercurial-tests/testData/testPurge/hg/last-message.txt Mon Jun 02 14:23:40 2014 +0200 @@ -1,1 +1,1 @@ -Add same repo in rev 1 as subrepo at path self \ No newline at end of file +add same repo as a subrepo at path 'self' \ No newline at end of file
--- a/mercurial-tests/testData/testPurge/hg/requires Mon Jun 02 12:41:08 2014 +0200 +++ b/mercurial-tests/testData/testPurge/hg/requires Mon Jun 02 14:23:40 2014 +0200 @@ -1,4 +1,3 @@ -dotencode -fncache revlogv1 store +fncache
--- a/mercurial-tests/testData/testPurge/hg/store/fncache Mon Jun 02 12:41:08 2014 +0200 +++ b/mercurial-tests/testData/testPurge/hg/store/fncache Mon Jun 02 14:23:40 2014 +0200 @@ -1,4 +1,4 @@ -data/.hgsubstate.i +data/a.i data/.hgignore.i data/.hgsub.i -data/a.i +data/.hgsubstate.i
--- a/mercurial-tests/testData/testPurge/hg/store/phaseroots Mon Jun 02 12:41:08 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -1 8a9ae2d32de0d0c80124f88ec18e376587b0ecdb
--- a/mercurial-tests/testData/testPurge/hg/store/undo.phaseroots Mon Jun 02 12:41:08 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -1 8a9ae2d32de0d0c80124f88ec18e376587b0ecdb