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

Re: Merging single files

From: <rooneg_at_electricjellyfish.net>
Date: 2003-01-30 21:34:43 CET

Martin Kupisch wrote:

 Hi everyone,
 I have the following problem: I have checked out a working copy of
 some revision that is a branch. I work on this branch for some time
 and then fix a bug in one file of this branch that has to be merged
 into the trunk. To be clear, only this fix in one file should be added
 to the trunk. After reading the documentation and searching the
 mailing list I did not find a solution. I have no experience with
 versioning systems. How do I do this? It seems to me like a very
 common case. Is it possible?

certainly!

in your checked out version of trunk do something like:

$ svn merge -r 10:11 http://svn.host.com/repos/branches/mybranch/file file

this merges the changes to /branches/mybranch/file from revisions 10-11
into file (in your working copy). then verify the change with 'svn
diff' and commit.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 14 02:26:12 2006

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