[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Doing builds with subversion

From: Tom Kielty <tom.kielty_at_calabrio.com>
Date: 2007-06-18 22:43:09 CEST

Thanks for the information. I have been working on our process since
this e-mail. Currently I am doing a tag then a co from the tag. Also for
the rc's I am logging each rc that is updated and then doing a single ci
at the end of the build process into the tag. That is working great.

However, the issue I am dealing with now is how to accomplish merge
discussed below. As my WC is from the tag when a developer has a build
fix I thought he could tell me the revision number of his ci. Then I
would merge that revision with the tag and be good to go. What I did not
understand was that the merge, merges with my WC not the tag. So then I
need to ci the tag. But at that point I have many other files that are
either updated (the rc's) or new and the ci gets flagged. So it seems
that I need to do an explicit ci for the updated files. What I am
worried about is how much manual work this is and if there are many
files that are updated it will take a lot of time to get these updated
in the tag.

Is there a simpler approach to do a merge and only ci those files to the
tag when other files are flagged as modified or un-versioned?



-----Original Message-----
From: Jim Sokoloff [mailto:jim@sokoloff.com]
Sent: Monday, May 28, 2007 5:42 PM
To: Tom Kielty
Cc: users@subversion.tigris.org
Subject: Re: Doing builds with subversion

On Mon, 28 May 2007, Tom Kielty wrote:

> The first one deals with the tagging process for a build/release.

Consider always branching for a release. Branch (svn copy) as
the first step, then checkout that working copy. If it builds,
great. If it doesn't, the developer responsible checks their
fix into mainline and svn merges that into the branch and
also commits it there. You then re-spin the build by doing
an update on the build machine (which is "looking at" the
branch, which only has that one change) and continuing.

> The next issue deals with updating files during the build.
> So my question is am I stuck not updating the files to prevent the 100
> revisions, or is there a way to do a commit on only certain files and
> ignore the rest?
> i.e. svn ci *.rc -m"Updated per the build"

That would work on Unix shells as they expand the arguments before
running the svn command. Doesn't work in cmd, as cmd doesn't work
that way.

However, you can use a response file with the --targets command,
so you can

dir /b *.rc > files.lst
svn ci -m "Updated by the build" --targets files.lst


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jun 18 22:43:49 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.