On Wed, Jan 21, 2009 at 08:00:35AM +0200, Ilan Yaniv wrote:
> 1) I am running svn diff and put the output within a log file.
Such files are usually called "patches", not log files,
because they can be used as input for the "patch" program.
The "log" in Subversion's terminology is usually the output
of "svn log", i.e. the meta data about the versioned history.
> 2) I am not replacing the files within the SVN Tag folders. I replace
> files on the working directory from Tagged revision to the HEAD
> revision.
> I was looking for the command line that will run this replace.
So you are checking out a tag into a working copy, and then you
want to copy files from trunk into the working copy.
And then? What do you want to do next?
Checking out a working copy usually implies that you want to
commit changes to the files you are checking out. Which in case
of a tag means that you want to modify the tag. Which is usually
not something people would want to do. But I am repeating myself...
So, I'm still not sure that I understand what you are trying to do.
Maybe it would help if you told us what svn commands you are running
up until the point where you get stuck? And what kinds of commands
you would like to run after that point?
Do you understand the concept of release branches and are you
sure it is not the right concept to use in your case?
Stefan
>
> ILAN
>
> -----Original Message-----
> From: Stefan Sperling [mailto:stsp_at_elego.de]
> Sent: Tuesday, January 20, 2009 7:48 PM
> To: Ilan Yaniv
> Cc: users_at_subversion.tigris.org
> Subject: Re: making hotfix
>
> On Tue, Jan 20, 2009 at 04:27:39PM +0200, Ilan Yaniv wrote:
> >
> > Hi All,
>
> Hi again,
>
> taking one step back. The previous answers I gave were useless.
> Please ignore them.
>
> > I want to create a hotfix which controlled files are being added.
> >
> > I have created a log that does a diff between Tag path and Trunk
> path.
>
> What do you mean? 'svn log' does not "do a diff". It just lists
> the log messages and possible files affected.
>
> > Now, I have checked out all files from Tag path to D:\Dev folder.
> >
> > I want now to override some files with the files from the log.
>
> You mean you want to replace files inside the tagged directory?
> That's generally considered bad practice. You should consider
> using a "release branch" for your releases instead of modying tags.
> This will allow you to apply fixes to your releases without
> changing tags. Please read this:
> http://svnbook.red-bean.com/en/1.5/svn.branchmerge.html
> Take note of this section in particular:
> http://svnbook.red-bean.com/en/1.5/svn.branchmerge.commonpatterns.html#s
> vn.branchmerge.commonpatterns.release
>
> Hope this helps,
> Stefan
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1040417
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-01-21 12:49:19 CET