git svn - I tagged in git-svn, and now my master always commits to the svn tag! -

-

i've got basic git-svn setup:

   [core]            repositoryformatversion = 0            filemode = false            bare = false            logallrefupdates = true            symlinks = false            ignorecase = true            hidedotfiles = dotgitonly            autocrlf = true    [svn-remote "svn"]            url = https://svnserver:8443/svn/project            fetch = trunk:refs/remotes/trunk            branches = branches/*:refs/remotes/*            tags = tags/*:refs/remotes/tags/*

i created tag off trunk (master in git) issuing following:

git svn tag -m "3.6.1" 3.6.1

this created new tag in svn @ /tags/3.6.1. in addition, saw new /remotes/tags/3.6.1 listed in remote branches.

at point, i'd checkout out local branch 3.6.1 remote , made changes. merged them master (i think big mistake). master seems think has history 3.6.1 tag.

now every time commit master dcommit, they're going 3.6.1 tag!

jakes@mymachine /cygdrive/d/projects/project (master) $ git svn dcommit committing https://svnserver:8443/svn/project/tags/3.6.1 ...     m       filethatchanged.js committed r6027

is there easy way can set things straight again?

been while since i've used git svn, try command this:

git branch --set-upstream svn/trunk

or

git branch --set-upstream refs/remotes/trunk

if doesn't work can post [branch "master"] section of git config well?


Comments

Post a Comment

Popular posts from this blog

c# - how to write client side events functions for the combobox items -

-
<dx:aspxcombobox id="aspxcombobox2" runat="server" clientidmode="autoid" selectedindex="-1" onselectedindexchanged="aspxcombobox1_selectedindexchanged1" > <clientsideevents selectedindexchanged="function(s, e) { grid.selectrows();}" /> <items> <dx:listedititem text="selecte rows" /> <dx:listedititem text="unselectall" /> </items> </dx:aspxcombobox> i want write event "unselect all" item in combobox. how can this? you'll need write javascript function iterates thru combo-box , marks selected items false. see select/unselect checkbox fields using pure javascript , html sample code msdn:
Read more

exception - Python, pyPdf OCR error: pyPdf.utils.PdfReadError: EOF marker not found -

-
pypdf throws exception: pypdf.utils.pdfreaderror: eof marker not found i don't need fix pypdf, need eof error cause "except" block execute , skip on file, doesn't work. still causes program stop running. background: batch ocr program pdfs python, pypdf, adobe pdf ocr error: unsupported filter /lzwdecode ... saga continues. i got 10,000 pdfs in folder. ocrd, not. can't tell 'em apart. step 1 figure out ones not ocrd , ocr (see other threads details). so i'm using pypdf. exceptions related unrecognized characters , unsupported filters when try read text. guestimated if throws exception, it's got text in , doens't go in list. problem solved, right? so: pypdf import pdffilewriter, pdffilereader import sys, os, pypdf, re path = 'c:\users\homer\documents\my pdfs' filelist = os.listdir(path) has_text_list = [] does_not_have_text_list = [] pdf_name in filelist: pdf_file
Read more