mainSavannah Administration - Support: sr #106664, Merge SVN-Dump into picogen-svn

 
 

sr #106664: Merge SVN-Dump into picogen-svn

Submitter:  Sebastian Mach <smach>
Submitted:  Sun 08 Mar 2009 12:55:56 PM UTC
   
 
Category:  Source code repositories - developer access Priority:  5 - Normal
Severity:  3 - Normal Status:  Done
Privacy:  Public Assigned to:  Beuc
Operating System:  None Open/Closed:  Closed
* Mandatory Fields

Add a New Comment Rich Markup
   

Jump to the original submission

Fri 03 Jul 2009 07:25:23 AM UTC, comment #6: 

Awesome, thank you very much!

Sebastian Mach <smach>
Fri 03 Jul 2009 06:19:05 AM UTC, comment #5: 

Done!

Sylvain Beucler <Beuc>
Fri 03 Jul 2009 06:06:42 AM UTC, comment #4: 

The import is in progress :)

Sylvain Beucler <Beuc>
Wed 01 Jul 2009 06:59:54 AM UTC, comment #3: 

Success!

You can actually use cvs2svn to directly merge into an existing svn-repository, using --existing-repos, preferably with --dry-run at first. If there are collisions, you can use --trunk=FOO to give the cvs-trunk another name. If not needed, you can also --trunk-only.


Anyway, I uploaded a dump of the complete svn merger to:

bzip: http://picogen.org/bbaacckkuupp/dump(with-oldcvs)-20090701.txt.bz2

or plain: http://picogen.org/bbaacckkuupp/dump(with-oldcvs)-20090701.txt

You can use this dump to blindly overwrite the existing svn-repository.

Anonymous
Wed 01 Jul 2009 05:48:57 AM UTC, comment #2: 

Hi Sylvain,

thank you for your answer and sorry for the uber-late reply.

I am re-investigating this topic. I will try the rsync + local-merging now. When I got a proper merger, I will send it over to you!

Merci Beaucoup for your help.

Sebastian Mach <smach>
Tue 17 Mar 2009 08:18:04 PM UTC, comment #1: 

Hi,

I don't have experience with merging SVN repositories.
I found this: http://www.coelho.net/svn-merge-repos.html but I haven't tested, and the layout doesn't seem to suit your needs.

The best is to the merge yourself and then send us a dump that we can import, overwritting the previous one. You can make use of rsync://svn.sv.gnu.org/svn/picongen/

Or, you can point me to documentation or tool to do it, and I'll see what I can do.

Sylvain Beucler <Beuc>
Sun 08 Mar 2009 12:55:56 PM UTC, original submission:  

Hello Savannah Administration,

I have a SVN-dump that I'd like to merge into picogen's SVN-tree.

I've made it so that the old files are all in a top-level directory "oldcvs", so that after the merge, I will be able to the remaining work inside SVN.

The SVN dump is located at



Sebastian Mach / phresnel
accout: smach
email: phresnel,at,gmail,dot,com


Sebastian Mach <smach>

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach Files:
   
   
Comment:
   

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -email is unavailable- added by Beuc (Posted a comment)
  • -email is unavailable- added by smach (Submitted the item)
  •  

    There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

    Only logged-in users can vote.

     

    Follow 4 latest changes.

    Date Changed by Updated Field Previous Value => Replaced by
    2009-07-03 Beuc StatusIn Progress Done
        Open/ClosedOpen Closed
    2009-03-17 Beuc StatusNone In Progress
        Assigned toNone Beuc

    Back to the top

    Powered by Savane 3.13-02a9.
    Corresponding source code