Autodeploy with Subversion (merging giving me a headache)

["Johnson, Rick" <Jo...@gc.adventist.org>]

Required info: Windows 2003, Subersion 1.1.1 (r11581), Apache 2.052,
Draco.Net 1.6.0, Nant .85

I have a repository set up like thus:

\Repository
	\Development
		file1
		file2
		file3
		...
	\Production
		file1
		file2
		file3
		...

I check out a working copy of the Development directory and make my
changes. When I commit to the Development direcotory I have a process
set up to automatically compile and deploy (with Draco.Net and NAnt) to
my staging server. When I am ready to go live with a build I merge
changes from the Development directory to the Production directory. When
changes are committed to the Production directory the application is
autodeployed (via essentially the same process) to my production server.

(for those who don't know or haven't infered what's going on: Draco.Net
looks at a pre-defined "directory" in the repository at specified
intervals and when changes are made, starts a pre-defined process, in my
case, a NAnt build script)

I'm having a very difficult time with merge tracking and have shot
myself in the foot a couple of times. In my situation, I would much
rather use Tags in the Production directory since that's really what I'm
deploying. My problem is that I haven't figured out a way to have the
autodeployment work with a directory full of Tags rather than just the
files.

Any suggestions would be helpful. I've thought of always having a
"Current" Tag and renaming it and creating a new "Current" tag when it's
time for a live build but that seems inelegant and doesn't impart any
date/time or version information. It would probably be more elegant that
what I've done to fix a screwed up merge though.

Thanks,
Rick

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Autodeploy with Subversion (merging giving me a headache)

[Andrew Thompson <su...@aktzero.com>]

Johnson, Rick wrote:
<snip>
> I'm having a very difficult time with merge tracking and have shot
> myself in the foot a couple of times. In my situation, I would much
> rather use Tags in the Production directory since that's really what I'm
> deploying. My problem is that I haven't figured out a way to have the
> autodeployment work with a directory full of Tags rather than just the
> files.
> 
> Any suggestions would be helpful. I've thought of always having a
> "Current" Tag and renaming it and creating a new "Current" tag when it's
> time for a live build but that seems inelegant and doesn't impart any
> date/time or version information. It would probably be more elegant that
> what I've done to fix a screwed up merge though.

I asked a question a day or so ago that was regarding a "current" tag. 
(Yes, I know, if it changes, it's not really a tag. And tag versus 
trunk, it's all in our heads.)

I just did a svn help list and see that the -v (or --verbose) tag causes 
more information to be dumped. The tags/ folder for my website looks like:

       3 athompso            Feb 27 00:49 2005.02.26/
       5 athompso            Feb 28 11:06 2005.02.27/

(Note that the tags were named for the period they represent, 2005.02.26 
and 2005.02.27.)

It shouldn't be too difficult to dump that to a file and figure out 
which date is the most recent and then read in the folder name.

Caveat: I don't know how this output would look if it contained a 
committed folder from last year. That would have to be taken into 
consideration.

-- 
Andrew Thompson
http://aktzero.com/

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org