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

Re: Merge svnraisetc branch to trunk

From: Senthil Kumaran S <senthil_at_collab.net>
Date: Thu, 07 May 2009 17:10:08 +0530

Stefan Sperling wrote:
> +1
>
> But please put it into tools instead of contrib.

I tried to '--reintegrate' this branch after syncing it with trunk, but it
deletes some files, the output is here,

<snip>
$ svn merge --reintegrate http://svn.collab.net/repos/svn/branches/svnraisetc .
--- Merging differences between repository URLs into '.':
U build.conf
U www/hacking.html
U www/images/svn-dav-securityspace-survey.png
U win-tests.py
D build/config.guess
D build/config.sub
U tools/backup/hot-backup.py.in
U tools/hook-scripts/svn2feed.py
U tools/hook-scripts/svnperms.py
U tools/hook-scripts/mailer/mailer.py
U tools/server-side/fsfs-reshard.py
U tools/dev/which-error.py
U contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
U contrib/client-side/svnmerge/svnmerge-migrate-history.py
U contrib/client-side/svnmerge/svnmerge.py
U contrib/client-side/emacs/psvn.el
A contrib/client-side/svnraisetreeconflict
A contrib/client-side/svnraisetreeconflict/main.c
U INSTALL
 U .
</snip>

So I plan to cherry pick the revisions to trunk, once that is in, I shall move
it to "tools".

-- 
Senthil Kumaran S
http://www.stylesen.org/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2093752
Received on 2009-05-07 13:41:02 CEST

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