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

Re: Copying only files that changed from branch into trunk

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-08-02 23:27:01 CEST

On 8/2/07, Ingo Schmidt <list@der-ingo.de> wrote:
> Hi everyone!
>
> I have the following situation:
>
> 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?

svn diff --summarize (if you're using SVN 1.4 or later) will list all
files which have changed.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 2 23:25:39 2007

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