[Pkg-shadow-devel] We need someone to mess up with branches in SVN

[Nicolas François]

Hi,

I see two ways of doing this (I have my preference):

  * merging (with svn merge) the changes done in the experimental branch
    to the trunk.
    To do that, we have to ignore the changes that were taken from the
    trunk (hopefully, those revisions (or most of them) are taged as such
    in the logs. So multiple svn merge have to be executed.
  * Consider that the trunk is now closed, and replaced by the
    experimental branch:
    svn delete trunk
    (svn ci)
    svn move branches/experimental trunk
    (svn ci)
    We have to make sure that the last changes in trunk were integrated to
    the experimental branch


An now the cute little ASCII art ilustrations:

1)     ________ experimental ____
      /   /              /       \
     /   /              /         \
____/___/_____ trunk __/___________\_____ trunk ____

                                   ^
                                   |
                                  now

2)     ________ experimental ____ 
      /   /              /       \
     /   /              /         \
____/___/_____ trunk __/______.    \_____ trunk ____


The second solution seems much more simple to me. We probably only need to
make sure that the changelog entry from the current trunk are included in
the changelog of the current experimental branch.

Any comment?

PS: BTW, we could also delete the files from the CVS repository (i.e.
commit a revision with all files deleted) and indicate that the repository
is now at svn.debian.org.
    Or maybe there is a way to make the CVS link point to the SVN
    repository?

Best Regards,
-- 
Nekral