Howto merge a svn repository with a git cloned repository (imported from SVN via github) -

-

in past i've have used github's import functionality import svn repository. repository same bare git without connection svn history. commits don't include svn-id information.

some time has passed , commits added svn repository expected git repository remained same.

so 'update' git repository commits added original svn. i've tried git-svn couldn't make git recognize common history between cloned svn , cloned git.

i've considered using format-patch , believe action should solve problem looking more automated way of doing it.

the restriction git history should maintained (no rebase'ing) , commits faithful svn repository possible (no svn-id added commit message).

as guessed, getting commits "merge" isn't going work here. have use format-patch. here how it:

$ git svn clone --no-metadata svn://.../ new-svn-repo $ cd new-svn-repo $ git log

(you may wish add -a option git svn clone rewrite svn authorship information user@uuid format proper joe user <user@example.com> authorship information. see man git-svn information.)

look through log , find commit corresponds latest commit in github repository. if commit abcdef then:

$ git format-patch -k abcdef

you have whole slew of *.patch files correspond new commits want port over. so...

$ cp *.patch /github/repository/location $ cd /github/repository/location $ git -k --keep-cr *.patch

tada! push master github.

(if git not new enough may complain --keep-cr argument git am. if source files not contain crs remove --keep-cr. if do, may need upgrade git since git mailsplit, called git am, strip of crs in patch files out when processing them. may cause patches fail apply.)


Comments

Post a Comment

Popular posts from this blog

android - Spacing between the stars of a rating bar? -

-
ho can set spacing beween stars? thats ratingbar: ratingbar = (ratingbar) inflater.inflate(r.layout.ratingbar, null); ratingbar.setlayoutparams(new layoutparams(layoutparams.wrap_content, layoutparams.wrap_content)); the layout: <?xml version="1.0" encoding="utf-8"?> <ratingbar xmlns:android="http://schemas.android.com/apk/res/android" style="@style/mystyle" android:layout_alignparentright="true" android:layout_height="19dp" android:layout_width="wrap_content" android:numstars="5"> </ratingbar> the style: <style name="mystyle" parent="@android:style/widget.ratingbar"> <item name="android:progressdrawable">@drawable/android_r2_ratingstar_yellow</item> <item name="android:indeterminatedrawable">@drawable/android_r2_ratingstar_grey</item> </style> thanks, cheers you have ...
Read more

html - Instapaper-like algorithm -

-
does of algorithm extracts contents webpage? instapaper ? there 2 steps instapaper does: find main content block on page (excluding headers, footers, menus etc) from content block extract , format text to find content block (typically html block element, div containing key page text content) instapaper uses algorithm 1 used readability . can @ source of readability.js see what's going on, @ core tries find area on page highest text/link ratio, although has other simple scoring metrics (e.g. off top of head, things ratio of text commas, para elements etc) go heuristics. once have identified root node element, relevant content, you'll need format it, if want can pull node element containing text out of source document , insert yours, in reality you'll want remove existing styles , apply own, standard , feel. if want output nice text-only can use jericho's renderer . update1 : should mention else instapaper - follow 'pagination' links (...
Read more

c# - How to execute a particular part of code asynchronously in a class -

-
i creating speech recognition engine that's going respond user commands.i have created button enable , disable speech recognition per user convenience.i have used dispose() of speech engine disable speech recoginition.here code private void button1_click(object sender, routedeventargs e) { engineon = !engineon; if (engineon) { speechengine = speech.createspeechengine(); //speech class creates , returns new speech engine. speechengine.audiolevelupdated += new eventhandler<audiolevelupdatedeventargs>(speechengine_audiolevelupdated); // use system's default microphone speechengine.setinputtodefaultaudiodevice(); speechengine.loadgrammar(new dictationgrammar()); // start listening speechengine.recognizeasync(recognizemode.multiple); } else { speechclass.myengine.dispose(); } } but disposal of speech obj...
Read more