Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: Merge svnraisetc branch to trunk

subversion
Discussion topic

2020-04-07: This site is going to be decommissioned and shut down on 2020-07-01. Please copy and archive any data you wish to keep before that date.

Back to topic list

Re: Merge svnraisetc branch to trunk

Author stylesen
Full name Senthil Kumaran S
Date 2009-05-07 04:40:20 PDT
Message 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.ne​t/repos/svn/branches​/svnraisetc .
--- Merging differences between repository URLs into '.':
U build.conf
U www/hacking.html
U www/images/svn-dav-s​ecurityspace-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/m​ailer/mailer.py
U tools/server-side/fs​fs-reshard.py
U tools/dev/which-error.py
U contrib/client-side/​svnmerge/svnmerge-mi​grate-history-remote​ly.py
U contrib/client-side/​svnmerge/svnmerge-mi​grate-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/

« Previous message in topic | 3 of 14 | Next message in topic »

Messages

Show all messages in topic

Merge svnraisetc branch to trunk stylesen Senthil Kumaran S 2009-05-07 02:51:56 PDT
     Re: Merge svnraisetc branch to trunk stsp Stefan Sperling 2009-05-07 04:36:39 PDT
         Re: Merge svnraisetc branch to trunk stylesen Senthil Kumaran S 2009-05-07 04:40:20 PDT
         Re: Merge svnraisetc branch to trunk glasser David Glasser 2009-05-10 13:38:05 PDT
             Re: Merge svnraisetc branch to trunk stsp Stefan Sperling 2009-05-10 14:03:18 PDT
                 Re: Merge svnraisetc branch to trunk stsp Stefan Sperling 2009-05-10 14:34:01 PDT
                 Re: Merge svnraisetc branch to trunk stylesen Senthil Kumaran S 2009-05-11 02:41:06 PDT
     Re: Merge svnraisetc branch to trunk hwright Hyrum K. Wright 2009-05-07 05:22:20 PDT
         Re: Merge svnraisetc branch to trunk kmradke at rockwellcollins dot com kmradke at rockwellcollins dot com 2009-05-07 06:05:19 PDT
             Re: Merge svnraisetc branch to trunk stsp Stefan Sperling 2009-05-07 06:38:21 PDT
                 Re: Merge svnraisetc branch to trunk hwright Hyrum K. Wright 2009-05-07 06:45:04 PDT
                     Re: Merge svnraisetc branch to trunk blair Blair Zajac 2009-05-07 08:37:17 PDT
                         Re: Merge svnraisetc branch to trunk gavinbaumanis Gavin Baumanis 2009-05-09 15:27:17 PDT
                             Re: Merge svnraisetc branch to trunk blair Blair Zajac 2009-05-10 22:34:55 PDT
Messages per page: