You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Ilan Yaniv <Il...@timetoknow.org> on 2009/01/20 14:27:39 UTC
making hotfix
Hi All,
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.
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.
So I do, SVN update with the files from the log and with current
revision:
For example:
svn update svn://dev5/dev/LMS/trunk/OfficeAutomation/web/envxl.html
D:\Dev --revision 26035
What I am getting is this line:
Skipped 'svn://dev5/dev/LMS/trunk/OfficeAutomation/web/envxl.html' At
revision 26035.
When I am doing diff or running update manually nothing happens
1) Why?
2) Should I use other command line?
3) Is there a better procedure to replace single files from a full
revision?
Thanks
Ilan Yaniv
Configuration Management
Phone: 03-7534333 ext. 5873
Ilan.Yaniv@timetoknow.org
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1037987
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: making hotfix
Posted by Stefan Sperling <st...@elego.de>.
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@elego.de]
> Sent: Tuesday, January 20, 2009 7:48 PM
> To: Ilan Yaniv
> Cc: users@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@subversion.tigris.org].
RE: making hotfix
Posted by Ilan Yaniv <Il...@timetoknow.org>.
1) I am running svn diff and put the output within a log file.
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.
ILAN
-----Original Message-----
From: Stefan Sperling [mailto:stsp@elego.de]
Sent: Tuesday, January 20, 2009 7:48 PM
To: Ilan Yaniv
Cc: users@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@subversion.tigris.org].
Re: making hotfix
Posted by Stefan Sperling <st...@elego.de>.
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#svn.branchmerge.commonpatterns.release
Hope this helps,
Stefan
Re: making hotfix
Posted by Stefan Sperling <st...@elego.de>.
On Tue, Jan 20, 2009 at 03:56:42PM +0100, Stefan Sperling wrote:
> On Tue, Jan 20, 2009 at 04:27:39PM +0200, Ilan Yaniv wrote:
> > svn update svn://dev5/dev/LMS/trunk/OfficeAutomation/web/envxl.html D:\Dev
> > --revision 26035
> >
> > What I am getting is this line:
> >
> > Skipped 'svn://dev5/dev/LMS/trunk/OfficeAutomation/web/envxl.html' At
> > revision 26035.
> >
> > When I am doing diff or running update manually nothing happens
> >
> > 1) Why?
> >
> > 2) Should I use other command line?
> >
> > 3) Is there a better procedure to replace single files from a full
> > revision?
>
> Use this syntax instead:
>
> svn update svn://dev5/dev/LMS/trunk/OfficeAutomation/web/envxl.html@26035 D:\Dev
Hmm.. on second thought, it might not quite make sense to pass the
full URL to 'svn update'.
What about:
cd D:\Dev
svn up -r26035 dev5/dev/LMS/trunk/OfficeAutomation/web/envxl.html
Does that do what you want?
Sorry about the confusion,
Stefan
Re: making hotfix
Posted by Stefan Sperling <st...@elego.de>.
On Tue, Jan 20, 2009 at 04:27:39PM +0200, Ilan Yaniv wrote:
> svn update svn://dev5/dev/LMS/trunk/OfficeAutomation/web/envxl.html D:\Dev
> --revision 26035
>
> What I am getting is this line:
>
> Skipped 'svn://dev5/dev/LMS/trunk/OfficeAutomation/web/envxl.html' At
> revision 26035.
>
> When I am doing diff or running update manually nothing happens
>
> 1) Why?
>
> 2) Should I use other command line?
>
> 3) Is there a better procedure to replace single files from a full
> revision?
Use this syntax instead:
svn update svn://dev5/dev/LMS/trunk/OfficeAutomation/web/envxl.html@26035 D:\Dev
See http://svnbook.red-bean.com/en/1.5/svn.advanced.pegrevs.html to
understand why.
Stefan