Mercurial > hgsubversion
view tests/fixtures/branch_rename_to_trunk.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 | 2242dd1163c6 |
children |
line wrap: on
line source
#!/bin/sh mkdir temp cd temp svnadmin create repo svn co file://`pwd`/repo wc cd wc mkdir branches trunk tags svn add * svn ci -m 'btt' cd trunk for a in alpha beta gamma delta ; do echo $a > $a svn add $a done svn ci -m 'Add files.' cd .. svn up svn cp trunk branches/dev_branch svn ci -m 'branch' cd branches/dev_branch svn rm delta echo narf > alpha echo iota > iota svn add iota svn ci -m 'branch changes' cd ../.. svn up svn mv trunk branches/old_trunk svn ci -m 'move trunk to a branch' svn up svn mv branches/dev_branch trunk svn ci -m 'move dev to trunk' cd .. cd .. svnadmin dump temp/repo > branch_rename_to_trunk.svndump echo echo 'Complete.' echo 'You probably want to clean up temp now.' echo 'Dump in branch_rename_to_trunk.svndump' exit 0