On Fri, Jun 7, 2013 at 12:21 PM, Sebastian Ramacher <[email protected]> wrote: > On 2013-06-07 12:10:44, Felipe Sateler wrote: >> On Fri, Jun 7, 2013 at 11:06 AM, Sebastian Ramacher >> <[email protected]> wrote: >> > On 2013-06-07 16:56:16, Jonas Smedegaard wrote: >> >> Quoting Sebastian Ramacher (2013-06-07 16:01:05) >> >> > On 2013-06-06 19:47:09, Felipe Sateler wrote: >> >> > > On Thu, Jun 6, 2013 at 4:28 PM, Sebastian Ramacher >> >> > > <[email protected]> wrote: >> >> > > > Hi Felipe, >> >> > > > >> >> > > > On 2013-06-05 12:02:29, Felipe Sateler wrote: >> >> > > >> On Tue, Jun 4, 2013 at 7:25 PM, >> >> > > >> <[email protected]> wrote: >> >> > > >> > The following commit has been merged in the master branch: >> >> > > >> > commit 0d4bdac6061229dda466724c0415334bee374b9b >> >> > > >> > Author: Felipe Sateler <[email protected]> >> >> > > >> > Date: Fri Apr 12 17:59:48 2013 -0300 >> >> > > >> > >> >> > > >> > Imported Debian patch 1:5.17.11~dfsg-3 >> >> > > >> >> >> > > >> But I' would have preferred if you would have notified me before >> >> > > >> importing this. I just forgot to push to the repository the >> >> > > >> changes for this release, I could have pushed them if you would >> >> > > >> have told me... >> >> > > >> >> >> > > >> >> >> > > >> PS: this commit seems to have some noise, though >> >> > > > >> >> > > > I'm truly sorry about that. I was to eager to upload the fix that >> >> > > > I just imported it myself and should have contacted you instead. >> >> > > > Do you have the commits still lying around somewhere so that we >> >> > > > can clean up the noise? >> >> > > >> >> > > I have pushed the commits+tag to the missing-commits branch. >> >> > >> >> > I took these commits and rebased the commits by Jonas and myself on >> >> > it, merged master into missing-commits (with -s ours) and then merged >> >> > missing-commits back to master. Before I push this to git.debian.org >> >> > you can check the result at >> >> > http://git.ramacher.at/?p=deb/csound.git;a=shortlog;h=refs/heads/master >> >> > (or git clone git://git.ramacher.at/deb/csound.git). >> >> > >> >> > If this is okay with you I'll push it to git.debian.org >> >> >> >> Not okay with me. >> >> >> >> Rebasing commits that have been published is a serious headache, and I >> >> see no need for that here. >> > >> > Huch, which serious headache? I didn't rewrite any history. Maybe me >> > choice of words was unfortunate. I didn't rebase it in a git rebase >> > sense. >> >> >> It seems to me you did, but you didn't rewrite history because then >> you merged the pre-rebase with the post-rebase. Is that correct? > > I exported the relevant commits from master [1], applied them on top > missing-commits, merged master into missing commits with -s ours to get > rid of the noise and merged missing-commits into master. If that's > something git rebase can do for me, please let me know so that I can > learn something new about git rebase.
I think it can. If we define a new branch torebase as commit 1598404a (ie, the last commit before the missing revision import), I think the following should have the same effect as what you did: git checkout torebase git rebase missing-commits git merge master -s ours > > If you have something more specific in mind to get this sorted, please > be more verbose because I can't seem to understand what you guys prefer. This is OK with me, as no local clones will have to force updates. -- Saludos, Felipe Sateler _______________________________________________ pkg-multimedia-maintainers mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
