Re: Copying only files that changed from branch into trunk

On Aug 2, 2007, at 16:13, Ingo Schmidt wrote:

> A branch has been created and worked on. At the same time work has
> been done on trunk. However, it turns out, that only those files that
> changed the in branch should now be taken.
>
> So basically I just want to copy everything that changed in the
> branch into trunk, no matter what has been done on the corresponding
> files in trunk.
>
> There are a lot of files where this happened, so copying each changed
> file by hand is the last resort. Is there a faster way of doing this?

Surely what you want is to merge your branch revisions back into the
trunk?

http://svnbook.red-bean.com/en/1.2/svn.branchmerge.html

http://svnbook.red-bean.com/en/1.2/
svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.wholebr

Perhaps you first want to revert changes that were made in the trunk?

http://svnbook.red-bean.com/en/1.2/
svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 3 05:30:36 2007