Syncing existing git with existing SVN repository -

-

okay, made mess. have svn repository code , have local git repository in work, branch, etc.. used commit things time time git svn using git-svn. got new computer , cloned git repository 1 other. tried use git-svn afterwards, due new version , me being not careful enough configuration somehow lost. used git svn init , clone history in svn, situation looks this: 

o--z--o--....--x--o--o....--o  (master)    |    o--o--o--....--x (remotes/git-svn)

x marking state in both repositories in same state (as master , git-svn in sync on old machine). now, i'd commit x head master svn repository, when use git svn dcommit -n shows diffs way z. how can sync git-svn , git , svn again (so can use dcommit commit stuff again)?

is possible go x , use git svn set-tree x (because current svn holds version) , go head git svn dcommit? don't want (blindly) try stuff on svn, there lot of more stuff in (by many other people) don't want screw up.

git svn dcommit looks in history of branch until finds commit message contains git-svn-id: line, it'll go z in case, observe. try rebase master branch onto remotes/git-svn. haven't tested this, following try:

 # make sure you're on master  git checkout master   # create new branch here save old branch  git branch old-master   # rebase after x on master tip of master  # onto remotes/git-svn  git rebase --onto remotes/git-svn <commit-id-of-x-in-master> master

after that, history should like:

o--z--o--....--x--o--o....--o  (old-master)    |    o--o--o--....--x (remotes/git-svn) --o--o....-o (master)

... , git svn dcommit should work expected - however, i'd try --dry-run first, sure.


Comments

Post a Comment

Popular posts from this blog

objective c - Change font of selected text in UITextView -

-
can suggest me how change font of selected text in uitextview.i cannot use uiwebview since have edit text. have seen pages app.how possible in app. see formatting text within uilabel differently . since need editing, should @ javascript-based editors such ckeditor or tinymce . highly recommend wwdc 2011 video session 511: "rich text editing in safari on ios."
Read more

php - Accessing POST data in Facebook cavas app -

-
so i've got simple form in canvas / iframe facebook app, , i'm trying pass along values post. reading on s.o. , fb's latest docs, understand it, data send via post form can accessed on receiving end $_request object. i read on thread on s.o. in order post forms work need pass along input named "signed_request" value current signed_request (i have signed request working ok otherwise...all login , authentication stuff working fine). isnt mentioned anywhere in official fb docs. so problem comes in $_request object signed request, , bunch of other session stuff. form inputs found. the way can read them set method of form "request" isn't real form method. takes of inputs , sends them args in url. horrible. here's sample page canvas app form i'm using try debug (leaving out authentication stuff): <form enctype="application/x-www-form-urlencoded" method="post" target="_top" id="my_form" action=...
Read more

c# - Getting control value when switching a view as part of a multiview -

-
i have following code in aspx page: <asp:button id="display_button" runat="server" text="display" onclick="button1_click" /> &nbsp; <asp:button id="edit_button" runat="server" text="edit" onclick="button2_click" /> &nbsp; <asp:button id="save_button" runat="server" text="save" onclick="button3_click" visible="false" /> &nbsp; <asp:multiview id="multiview1" runat="server" activeviewindex="0"> <asp:view id="view1" runat="server"> <asp:formview id="view_program" runat="server"> <itemtemplate> <%# eval("status").tostring().trim() %> </itemtemplate> </asp:formview> </asp:view> <asp:view id="view2" runat="server"> ...
Read more