version control - How to use Git to tag a commit rather than a hash -


i have large series of commits, various version tags, i.e.:

root->x->x->1->x->x->x->2->x->x->3->x->4->x->x->x->5->master

i want insert new commit near start of this. problem is, need go through , re-tag everything, because tree ends looking this:

root->x->x->y->x->x->x->x->x->x->x->x->x->x->x->x->x->x->master          \->1->x->x->x->2->x->x->3->x->4->x->x->x->5

is there way can tag specific commit, rather specific hash? when rebase, tags apply same specific commits, in new tree, rather original commits?

note: not interested in moralizing - please don't post answers saying things "you're doing wrong" or "that's not how versioning supposed work" unless can provide constructive alternative. need way mark commits persist after rebase, if possible solution "git doesn't that, use x instead".

here alternative solution i've seen many repositories use.

  • create branch every major version want maintain.
  • push fixes/updates every branches. use merging/rebasing/cherry-picking between them when possible avoid repetitive work.
  • tag commits in branches minor/patch versions.

example:

  • you have master branch.
  • you release version 1.0.0 pointing current master.
  • you continue push master , release 1.1.0 version.
  • you make major refactor/backwards incompatible changes , release 2.0.0 version.
  • you could (and should) make 1.x branch pointing previous 1.1.0 version.
  • you push bug fix (in master) affects both 2.x , 1.x versions.
  • tag commit 2.0.1. cherry-pick in 1.x branch , tag 1.1.1.

there variations workflow. have branch major versions , master branch active development branch next major version.

i think solving problem going deeper , addressing root cause of workflow - pushing change several versions.

i should mention changing tags point after you've pushed tags bad. bad.


Comments

Post a Comment

Popular posts from this blog

Android layout hidden on keyboard show -

i have strange problem layout. when tap on edittext , keyboard shown edittext stay on bottom , when tap on to hide keyboard , keyboard hides , edittext go should when want input text. when tap again, keyboard shown , edittext goes down behind keyboard... <relativelayout android:layout_width="match_parent" android:layout_height="match_parent" > <scrollview android:layout_width="match_parent" android:layout_height="fill_parent" android:above="@+id/rl_commands"> <textview android:layout_width="match_parent" android:layout_height="wrap_content"/> </scrollview> <relativelayout android:layout_width="match_parent android:layout_height="24dp" android:id="@+id/rl_commands" android:alignparentbottom="true">
Read more

google app engine - 403 Forbidden POST - Flask WTForms -

i have flask application running on google app engine. trying submit form built using wtform , keep getting following error. 403 forbidden: don't have permission access requested resource. either read-protected or not readable server. location.html (part of code) <form method=post action="/home/location"> .... <button type="submit" class="btn btn-primary" value="submit"> directions </button> </form> main.py @app.route('/home/location', methods=['post', 'get']) def location(): form = cfcdirections.direction(request.form) print(request.method) if request.method == 'post' , form.validate(): print("after if") directions = cfcdirections() street_no = directions.no street = directions.street suburb = directions.suburb postcode = directions.postcode
Read more

c - Why would PK11_GenerateRandom() return an error -8023? -

i looking through internet trying find source of pk11_generaterandom() function see why function fail. have program uses function when moved new flavor of linux, fails after forking ( fork() ) since not believe there problem nss, suspect doing incorrectly disregarded in older versions of linux new 1 there issue. the openssl package same on 'good' , 'bad' server: openssl 0.9.8e-fips-rhel5 01 jul nss rpm differs though. 'good' has nss-3.12.2.0-2.el5 and bas has version nss-3.15.3-4.el5_10 the 'good' server uses quite obsolete linux: linux 2.6.18-128.el5 #1 smp wed jan 21 08:45:05 est 2009 x86_64 x86_64 x86_64 gnu/linux enterprise linux enterprise linux server release 5.3 (carthage) red hat enterprise linux server release 5.3 (tikanga) the 'bad' server newer: linux bad 2.6.18-371.4.1.el5 #1 smp wed jan 29 11:05:49 pst 2014 x86_64 x86_64 x86_64 gnu/linux oracle linux server release 5.10 red hat enterprise linux server release
Read more