rebasing older branches on (vs merge from) master

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I'd like to know if rebasing in the packages git repo is generally
frowned upon or I can use for my use case. Basically, I have a package
that has some broken tests upstream is looking into; however these
failures only shows on rawhide, so I have tests disabled there until
situation if fixed.

Other, unaffected branches, has a commit to restore the tests
execution, something like this:

[giallu@faxe rdkit (f25)]$ git lola
* fb42a18 (origin/master, origin/HEAD, master) new upstream release
* 224900e - fix non-x86 builds universally
| * 3346783 (HEAD -> f25, origin/f25) reactivate tests
|/
* bb09397 temporarily disable tests

so now I would like to rebase f25 to master so I pickup the new
release AND keep the tests activated.

Opinions?


-- 
Gianluca Sforna

http://plus.google.com/+gianlucasforna - http://twitter.com/giallu
Tinker Garage - http://tinkergarage.it
_______________________________________________
packaging mailing list -- packaging@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to packaging-leave@xxxxxxxxxxxxxxxxxxxxxxx




[Index of Archives]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite Forum]     [KDE Users]

  Powered by Linux