Mercurial > hgsubversion
view tests/fixtures/commit-to-tag.sh @ 628:4375d37fea1e
svnrepo: fix issue 187: ignore pushable bookmarks in hg 1.6
Mercurial 1.6 introduces two new methods for repo subclasses -- pushkey and
listkeys -- to support pushing/pulling bookmarks between hg repositories.
(See mpm's blog post http://www.selenic.com/blog/?p=644 for details.)
Unfortunately, these are only defined in the subclasses, and not in the repo
base class. Perhaps the bookmarks extension should also be checking the repo
for pushkeys capability by calling repo.capable('pushkey') to check.
It doesn't.
In the meantime, we can implement these ourselves.
svnrepo should declare these methods since it is derived directly from repo.
They do nothing -- listkeys merely returns an empty dictionary; pushkey
returns False; this is the behaviour of httprepo or sshrepo when the remote
end is running an earlier version of Mercurial.
svnlocalrepo should not declare these methods since it derives from a
subclass of localrepo, which already will have them, unless some other badly
behaved extensions are doing something intensely weird.
author | James McKay <code@jamesmckay.net> |
---|---|
date | Sun, 04 Jul 2010 18:21:20 +0100 |
parents | 9e6499c415a9 |
children |
line wrap: on
line source
#!/bin/sh mkdir temp cd temp svnadmin create repo REPOPATH="file://`pwd`/repo" svn co $REPOPATH wc cd wc mkdir -p branches/magic trunk tags svn add * svn ci -m 'btt' cd branches/magic for a in alpha beta gamma; do echo $a > $a svn add $a svn ci -m "Add file $a" done cd ../.. svn up svn cp $REPOPATH/branches/magic $REPOPATH/tags/will-edit -m 'Make tag to edit' svn up cd branches/magic for a in delta iota lambda; do echo $a > $a svn add $a svn ci -m "Add file $a" done cd ../.. cd tags/will-edit svn rm alpha svn ci -m 'removed alpha on a tag. Moves tag, implicit branch.' cd ../.. cd branches/magic for a in omega; do echo $a > $a svn add $a svn ci -m "Add file $a" done cd ../.. svn up svn cp $REPOPATH/branches/magic $REPOPATH/tags/also-edit -m 'Make tag to edit' svn up echo not omega > branches/magic/omega echo not omega > tags/also-edit/omega svn ci -m 'edit both the tag and its source branch at the same time' echo more stupidity > tags/also-edit/omega svn ci -m 'Edit an edited tag.' svn cp $REPOPATH/tags/also-edit $REPOPATH/tags/did-edits -m 'Tag an edited tag' svn cp $REPOPATH/branches/magic $REPOPATH/branches/closeme -m 'Make extra branch for another bogus case' svn cp $REPOPATH/branches/closeme $REPOPATH/tags/edit-later -m 'Make tag to edit after branch closes' svn rm $REPOPATH/branches/closeme -m 'Close the branch' svn up echo boofar > tags/edit-later/delta svn ci -m 'Edit this tag after its parent closed' # try and revert will-edit to its original state svn up svn merge -r9:8 $REPOPATH . svn ci -m 'Revert revision 9.' # make a tag from a branch and edit it at the same time svn up svn cp branches/magic tags/edit-at-create echo alpha >> tags/edit-at-create/alpha svn ci -m 'make a tag from a branch and edit it at the same time' cd ../.. svnadmin dump temp/repo > commit-to-tag.svndump echo echo 'Complete.' echo 'You probably want to clean up temp now.' echo 'Dump in commit-to-tag.svndump' exit 0