[Reportbug-maint] Short term plan for Reportbug versions

[Sandro Tosi]

On Sun, Aug 17, 2008 at 01:53, Sandro Tosi <matrixhasu at gmail.com> wrote:
>> 2. merge Chris' branch onto trunk and upload it in experimental
>
> on going: I had a really hard time to get this working, since modules/
> branch was created from a git-svn repo, so all the history would be
> lost if I had merged onto trunk (and tech issues prevent this, like
> reportbug file->dir change).
>
> So what I did was:
>
> 1. copy trunk to branches/manual_merge
> 2. apply merge.sh (attached) from within manual_merge
> 3. manual picking files from branches/modules and copying to
> manual_merge (Notes: I didn't merge README.developers, but take a note
> on TODO to update "source layout" section; reapplied fixes in 3.45 to
> reportbug/ui/urwid.py and reportbug/debianbts.py)
>
> Chris, please give it (it=branches/manual_merge) a look, if all your
> changes are there. If for you it's ok, I'll

2 weeks, no reply: I'm going on.

> 1. svn mv trunk branches/trunk_premodules

Done:
$ svn mv svn+ssh://morph-guest@svn.debian.org/svn/reportbug/trunk
svn+ssh://morph-guest@svn.debian.org/svn/reportbug/branches/trunk_bck_2008-08-30

> 2. svn mv branches/manual_merge trunk

Done:
svn cp svn+ssh://morph-guest@svn.debian.org/svn/reportbug/branches/manual_merge
svn+ssh://morph-guest@svn.debian.org/svn/reportbug/trunk

Please, check out again trunk:

svn co svn+ssh://morph-guest@svn.debian.org/svn/reportbug/trunk reportbug

Sandro

-- 
Sandro Tosi (aka morph, Morpheus, matrixhasu)
My website: http://matrixhasu.altervista.org/
Me at Debian: http://wiki.debian.org/SandroTosi