On 10/14/13, Antonio Terceiro <[email protected]> wrote: >> I decided to help rails packagers and update ruby-sprockets to fix >> #725386. But I didn't noticed problems with branches `upstream' and >> `pristin-tar' until I did `git push'. > what problems exactly?
initial release was made for 2.4.0, then 2.4.3 was prepared for experimental, but that was made not in usual branches master and upstream, but in master-experimental and upstream-experimental. After a while master-experimental was merged into master, but upstream-experimental not, so the last version in upstream was 2.4.0. So, when I run `git import-orig' it was unable to merge upstream into master properly. I had thought 'wtf?' and run mergetool (it was a very bad decision, I know, `git merge upstream upstream-experimental' is proper one). >> So now ruby-sprockets repository >> requires `git rebase -i' (and ruby-atomic requires it too, but it >> doesn't in so ugly state). > could you please ellaborate on why `git rebase -i` is required? You > should not do this kind of stuff with published branches. Cause now it has 2 merges of `upstream/2.10.0' into master, and the first one should be removed. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/caab-kcmesrdrbczwbyq8rfru090frso-zkkkyhzaiqmpcoo...@mail.gmail.com
