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

Cursor error with postgresql, pgpool and php -

-
hey, struggling bit determine exact cause of error has been popping in our release environment. there not seem dealing particular error on google. this error message getting: sqlstate[34000]: invalid cursor name: 7 error: portal "" not exist the error pops when using pdo prepared statements. this setup our release environment: pgpool 3.0.1 (the postgresql backend in streaming replication mode!) php 5.3.5 postgresql 9.0 edit: architecture 64bit. the same error not manifest in our test environment (edit: forgot mention, standard test environment uses postgresql 9.0 without pgpool). thus, led suspect pgpool @ least partly suspect. does know probable causes error are? edit: ok, here example of kind of code causes error. $sql = 'select * '; $sql .= 'from "mytable" "mystuff" '; $sql .= 'where "mytable"."status" = 1 '; $sql .= 'and "mytable"."mytableid" = :table...
Read more

delphi - ESC/P programming! -

-
why need use because printers using tprinter prints weird hieroglyph @ beginning of printable area. my problem if send commands, nothing happens. esc e (#27 #69) - sending escape sequence didn't work expected. removed first letter , rest of string made bold. eg. hello -> ello . after changed esc e esc (#27 #69 #27), worked fine. example managed figure out, but... trying select character table "esc t n" (#27 #116 n), make "õäöü" work. command doesn't work. nothing happens! , command supported esc/p, esc/p 2 , 9-pin esc/p, should work fine. manual can found here . if has ever needed use esc/p commands maybe 1 can shed light how work them! thanks in advance! edit: in previous post asked more or less same question though answers how did send commands printer. (i'll change question there according answers!) i accepted ken's answer, because claimed way transferred commands wasn't best , got work escape command. problem after t...
Read more

c++ - error: use of deleted function -

-
i've been working on c++ code friend has written , following error have never seen before when compiling gcc4.6: error: use of deleted function ‘gamefsm_<std::array<c, 2ul> >::hdealt::hdealt()’ implicitly deleted because default definition ill-formed: uninitialized non-static const member ‘const h_t floppokergamefsm_<std::array<c, 2ul> >::hdealt::h’ edit: comes part of code using boost msm: boost webpage edit2: there no = delete() used anywhere in sourcecode. generally speaking, error mean? should looking when type of error occurs? i don't think other answers mentioning =deleted; syntax correct. error message says default constructor has been deleted implicitly . says why: class contains non-static, const variable, not initialized default ctor. class x { const int x; }; since x::x const , must initialized -- default ctor wouldn't initialize (because it's pod type). therefore, default ctor, need define 1 (and must ...
Read more