Continuing partial git svn dcommit after failed pre-commit hook -


trying import existing git repository svn per this answer; went smoothly couple of commits, hit failed precommit hook.

r180827 = 444fa1c75e5a31fe8d887637a7fbd3fc62b34354 (refs/remotes/trunk) no changes between current head , refs/remotes/trunk resetting latest refs/remotes/trunk unstaged changes after reset: m       [some file] m       [another file] m       [...etc...]               [problem file] repository hook failed: 'pre-commit' hook failed error output: [error description]   @ /usr/libexec/git-core/git-svn line 922

i fixed hook past it; when tried git svn dcommit again (clearly wrong), got

[some file]: needs update [another file]: needs update [...etc...]

when 'git status', get:

#       modified: [some file] #       modified: [another file] #       modified: [...etc...] # # untracked files: #   (use "git add<file>..." include in committed #        #       [problem file] #       [other file modified in commit created problem file] #       [yet other files modified in commit] #       [...etc...]

i suppose blow whole svn tree away , start over, i'd rather not. how recover , continue dcommit?

i got exact same problem because of following error when dcommitting:

   0 [main] perl.exe" 5992 handle_exceptions: exception: status_access_violation 6635 [main] perl.exe" 5992 open_stackdumpfile: dumping stack trace perl.exe.stackdump

since not find other solution, did local commit on changes "uncommitted" (as per last example in question), , after run dcommit again. squashed remaining local commits single one, @ least worked.

if knows of better solution, highly appreciated.


Comments

Post a Comment

Popular posts from this blog

jquery - Invalid Assignment Left-Hand Side -

i trying assign class tag via jquery, resulting in error through firebug says "invalid assignment left-hand side" on fourth line below. <cfoutput> $('.pngfix a').each(function(index) { var hreflink = $(this).attr("href"); if (hreflink.tolowercase() = '../audio.cfm') { $(this).addclass('audioimg'); } }); </cfoutput> looking around online, looks syntax problem, don't seem see it... any tips? thanks if (hreflink.tolowercase() = '../audio.cfm') that attempts assign value, rather check equality. change = operator == .
Read more

java - Play! framework 2.0: How to display multiple image? -

i need display gallery of photos. here template: @(photos: list[photo]) @title = { <bold>gallery</bold> } @main(title,"photo"){ <ul class="thumbnails"> @for(photo <- photos) { <li class="span3"> <a href="#" class="thumbnail"> <img src="@photo.path" alt=""> </a> </li> } </ul> } and here controller method: public static result getphotos() { return ok(views.html.photo.gallery.render(photo.get())); } and here photo bean : @entity public class photo extends model { @id public long id; @required public string label; public string path; public photo(string path, string label) { this.path = path; this.label = label; } private static finder<long, photo> find = new finder<long, photo>( long.class, photo.class); public static list<phot...
Read more

gmail - Is there any documentation for read-only access to the Google Contacts API? -

i want read-only access user's google contacts. there stackoverflow member wanted this, , received following answer : yes, there is, use https://www.googleapis.com/auth/contacts.readonly scope , "view contacts". this exchange reference read-only access google contacts can find using google. simply using access token obtained attempt read usual google contacts api (i.e. https://www.google.com/m8/feeds ) fails insufficient permissions. similarly, using google contacts api on new target fails 404 errors (for example https://www.googleapis.com/auth/contacts.readonly/default/full ). is there documentation anywhere on how use api, or permissible way access google contacts api full read-write access?
Read more