[Pkg-lyx-devel] svn-upgrade and branches

[Per Olofsson]

Sven Hoexter wrote:
> On Thu, Jun 05, 2008 at 11:45:27PM +0200, Per Olofsson wrote:
>> Sven Hoexter wrote:
>>> I first played a bit around with svn-load but found that to be not really
>>> usefull in the end. So for the moment I've only made local changes to the
>>> created branch and used mergeWithUpstream to build a source package I can
>>> feed to pbuilder.
>> OK, but I really prefer having everything in SVN...
> 
> I'll try to work that out somehow. I just don't want to create a mess in
> the repository with merge problems afterwards.

OK, I've checked in 1.6.0~beta3 now. Here's what I did:

cat >.svn/deb-layout <<EOF
upsTagUrl=svn+ssh://svn.debian.org/svn/pkg-lyx/lyx/branches/upstream >
upsCurrentUrl=svn+ssh://svn.debian.org/svn/pkg-lyx/lyx/branches/upstream/current
EOF

svn-upgrade ../lyx_1.6.0~beta3.orig.tar.gz
debcommit

svn rm $debian_svn/pkg-lyx/lyx/branches/upstream/current -m "remove current"

svn cp $debian_svn/pkg-lyx/lyx/branches/upstream/{1.5.5,current} \
	-m "copy stable as current"

I moderated out the commit messages from the list as they were quite large.

I still want to switch to git. svn-upgrade slowed my system to a crawl and ate
half of my memory :-)

-- 
Pelle