[Pkg-samba-maint] upstream svn merge howto

[Steve Langasek]

Hi folks,

Now that 3.0.28 is out, we have a test case to use to make sure merging
works properly.

Here's the command I've run from inside an unpacked upstream Samba tarball:

$ svn-load -t tags/samba/upstream_${version} \
svn+ssh://svn.debian.org/svn/pkg-samba branches/samba/upstream .

The svn-load command is in the aptly-named "svn-load" package.  The above
is the simplest use of svn-load to merge a new upstream version into the
"upstream" branch and copy it to a per-version tag directory; please see
"svn-load --help" for a list of other options that are of interest.  In
particular, you may find that the --wc option saves time if you're on a slow
connection, and the "-m" option may be needed if files are moved around in
the upstream repository and this needs to be indicated to prevent subversion
treating this as addition and deletion of unrelated files.

Note that this only imports the new upstream version into the branch, it
doesn't merge it onto the trunk.  For this, you should go to your (clean)
working copy of the trunk and run:

$ svn merge \
svn+ssh://svn.debian.org/svn/pkg-samba/tags/samba/upstream_{prev_version,new_version}
$ svn commit -m "merge upstream $version"

And running "svn diff" before commiting will of course also give you a nice
opportunity to review the upstream diff before uploading. :-)

I don't know if these instructions should be stored somewhere in the repo
itself, the way we store the patch refreshing instructions in the individual
patches?

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org