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

Merge rev from trunk to tag issues

From: Tom Kielty <tom.kielty_at_calabrio.com>
Date: 2007-07-12 00:01:34 CEST

I am having problems merging a revision from our trunk to a tag.


When we do a build we create a tag of the trunk. Then a checkout is done
of the tag. If the build fails, the developer responsible makes the fix
commits the change to the trunk. They send an e-mail to me that says
their fix in part of rev 123 for example. I then do a merge of trunk
revision 123 and my working copy:


svn merge -c 123 http://svnserver/trunk@123 > merge.txt


I then replace all the "U " with the working copy path in the
merge.txt file.


Then I do a commit


svn ci --targets merge.txt -m"Update"


The reason I use the merge.txt is that during the commit I only want the
files I specify to be committed. I am seeing some strange results and
wanted to confirm that my approach is correct?


Also I am running into the situation where a user has multiple revisions
for a fix. Is there an easy way to include all rev or a range of rev's
in the above example?




Received on Thu Jul 12 00:01:14 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.