On Fri, Aug 29, 2003 at 12:44:02PM +0300, Fabian Fagerholm wrote: > > * Check out the trunk you just created into a directory called > project-<version> (svn co).
I was with you up to this point. I don't normally name my working copy in the form project-<version> as that form is needed for actually making hte package and for that we need an exported copy of the working copy. Since I use layout A.A, my working copy is normally simply named "trunk". All work is done in it. My initial dh_make is run in an export of this named project-<version> and then project-<version>/debian directory is copied to trunk/debian and added to Subversion's control (svn add). Not sure if this is the easiest way to go about the initial steps, just the way I've been working with it. > and the new upstream version. (This section is largely based on the > Subversion Book) > * Download the new upstream source and unpack it. > * Use the svn_load_dirs tool to update the current upstream > version and tag it (this will be committed immediately): > * A.A. svn_load_dirs -t <version> > url://host/repos/projectX/vendor current > /path/to/new/version Might want to note that the <version> in these should probably reflect upstreams version naming/number. > versions. (You should do so in any case...) > * Check out HEAD (the latest version) of your trunk (svn co). > * Merge the differences between the previous upstream version and > the current (new) upstream version into your trunk (svn merge): > svn merge url://to/previous/version url://to/current/version > trunk Again, might want to indicate that the url://to/previous/version and url://to/current/version are referencing the upstream branch or vendor tags. -- Jamin W. Collins To be nobody but yourself when the whole world is trying it's best night and day to make you everybody else is to fight the hardest battle any human being will fight. -- E.E. Cummings -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
