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

Re: Can a merge follow changes in paths in trunk/branch?

From: Matt England <mengland_at_mengland.net>
Date: 2006-02-11 21:11:40 CET

Blair et al,

At 2/10/2006 11:53 PM, Blair Zajac wrote:
>cd trunk/newdir
>svn merge -r N:N+n ../../branches/b1/olddir

This is great, and it's working for me thus far for me in my pre-production
tests. I have yet to test it, but for folders/dirs that have files and
folders underneath them that have been changed, I may need to apply the
merges on individual files specified at the command line, and that seems to
work just as well, in the same fashion.

For what it's worth, I plan on renaming all the folders in the branch to
match the new folder names/structure/layout in the trunk, to both assist
with the merge and to make other branch-to-trunk comparisons easier, etc.

I now want to see how I can get a nice, clean listing of changes files in a
directory since a certain rev (possibly by formatting the output from 'svn
log -v') so I can possibly automate all this stuff for the many changed
files I have in my branch so I can plow them back into the trunk. (fyi: my
previous example was just a demo directory, but I *am* merging from the
branch into the trunk in my production/real repo.)

Anybody have any ideas on how to do this? (I might post this question in a
separate thread.)

I might also just try to run 'svn merge' on each, individual file per a
'find -exec svn merge' type automation...but we'll see.

>BTW, you can merge changes to files even if the files have changed.
>See the transcript below:
>
>[...]
>
>svn merge -r 5:6 ../../trunk (this will fail)
>svn merge -r 5:6 ../../trunk/passwd passwd.1 (this will work)

Yes, this appears to work as well. Another great tool in my toolbox to
help solve this problem. :)

-Matt

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Feb 11 21:13:51 2006

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