git svn - git svn - <file> was not found in commit <hash> -


in middle of pulling down (rather large) svn repo git-svn, encountered following error message (generic info substituted real info):

found possible branch point: svn://server/project/trunk/dir => svn://server/project/branches/branchname, <revision> initializing parent: refs/remotes/branchname@<revision> project/trunk/dir/file not found in commit <hash> (r<revision>)

i have read in other posts possible "un-fetch" info through tinkering. however, rather not lose history , go forward painlessly possible.

how can git-svn fetch continue?

this means receiving new svn revision modifies file (for reason) not exist in git commit equivalent of parent svn revision. 1 easy way cause inconsistent --ignore-paths (originally there no way configure , had entered on every git-svn command line might fetch). way on svn server end change repository permissions in such way whole subtree of files appears (from perspective) git repository has no history for.

the easiest way past immediate problem , continue git-svn fetch use --ignore-paths (or better svn-remote.svn.ignore-paths config entry) ignore problem part of tree. can away command line argument pass single revision , won't hit problem again until modifies on svn side.

if want recover without --ignore-paths need fix parent revision includes file being modified. wrote git-svn reset "un-fetch" refer less tinkering. can reset svn remote file created can integrate history. won't wipe out working copies, need reparent working branches on new history.


Comments

Post a Comment

Popular posts from this blog

asp.net - repeatedly call AddImageUrl(url) to assemble pdf document -

i'm using abcpdf , i'm curious if can recursively call addimageurl() function assemble pdf document compile multiple urls? something like: int pagecount = 0; int theid = thedoc.addimageurl("http://stackoverflow.com/search?q=abcpdf+footer+page+x+out+of+", true, 0, true); //assemble document while (thedoc.chainable(theid)) { thedoc.page = thedoc.addpage(); theid = thedoc.addimagetochain(theid); } pagecount = thedoc.pagecount; console.writeline("1 document page count:" + pagecount); //flatten document (int = 1; <= pagecount; i++) { thedoc.pagenumber = i; thedoc.flatten(); } //now try again theid = thedoc.addimageurl("http://stackoverflow.com/questions/1980890/pdf-report-generation", true, 0, true); //assemble document while (thedoc.chainable(theid)) { thedoc.page = thedoc.addpage(); theid = thedoc.addimagetoc
Read more

java - Android recognize cell phone with keyboard or not? -

in android app, want detect user's device if device has keyboard(like motorola milestone) , show corresponding user interface. guys know how that? ! regards justicepenny http://developer.android.com/reference/android/content/res/configuration.html public int keyboard the kind of keyboard attached device. 1 of: keyboard_nokeys, keyboard_qwerty, keyboard_12key. that's it!
Read more

iphone - How would you achieve a LED Scrolling effect? -

how achieve led scrolling effect example below? led sign - led ticker emulator iphone , ipad http://img.skitch.com/20101201-rsfh4p1bajb1wp94k466pdpiuj.preview.jpg sometimes remunerates comment in other posts :) have put code you, should implement font '8pin matrix' realistic feeling. uilabel *label; - (void)viewdidload { [super viewdidload]; label = [[uilabel alloc]initwithframe:cgrectmake(10, 50, 300, 20)]; label.font = [uifont fontwithname:@"courier-bold" size:16.0]; label.backgroundcolor = [uicolor blackcolor]; label.textcolor = [uicolor greencolor]; label.linebreakmode = uilinebreakmodecharacterwrap; // otherwise "…" label.text = @"this led text scrolled "; // blanks space between [self.view addsubview:label]; [nstimer scheduledtimerwithtimeinterval:0.12f target:self selector:@selector(scrolllabel) use
Read more