Re: Transfer notes when rebasing

2013-09-04 Thread Jeff King
On Wed, Sep 04, 2013 at 10:47:22AM +0200, Francis Moreau wrote: > > However, if the commit is dropped because we find while applying that it > > becomes empty, there is not much we can do. It may have been obsoleted > > by its counterpart patch that had a different patch-id, or it may even > > hav

Re: Transfer notes when rebasing

2013-09-04 Thread Francis Moreau
On Wed, Sep 4, 2013 at 10:28 AM, Jeff King wrote: > On Wed, Sep 04, 2013 at 08:59:41AM +0100, John Keeping wrote: > >> On Wed, Sep 04, 2013 at 03:53:10AM -0400, Jeff King wrote: >> > On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote: >> > >> > > When rebasing a branch which contains c

Re: Transfer notes when rebasing

2013-09-04 Thread Jeff King
On Wed, Sep 04, 2013 at 08:59:41AM +0100, John Keeping wrote: > On Wed, Sep 04, 2013 at 03:53:10AM -0400, Jeff King wrote: > > On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote: > > > > > When rebasing a branch which contains commits with notes onto another > > > branch it happens th

Re: Transfer notes when rebasing

2013-09-04 Thread Francis Moreau
On Wed, Sep 4, 2013 at 9:59 AM, John Keeping wrote: > On Wed, Sep 04, 2013 at 03:53:10AM -0400, Jeff King wrote: >> On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote: >> >> > When rebasing a branch which contains commits with notes onto another >> > branch it happens that some commits

Re: Transfer notes when rebasing

2013-09-04 Thread John Keeping
On Wed, Sep 04, 2013 at 03:53:10AM -0400, Jeff King wrote: > On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote: > > > When rebasing a branch which contains commits with notes onto another > > branch it happens that some commits are already presents in the target > > branch. > > > > I

Re: Transfer notes when rebasing

2013-09-04 Thread Jeff King
On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote: > When rebasing a branch which contains commits with notes onto another > branch it happens that some commits are already presents in the target > branch. > > In that case git-rebase correctly drops those (already present) > commits

Transfer notes when rebasing

2013-09-04 Thread Francis Moreau
Hello, When rebasing a branch which contains commits with notes onto another branch it happens that some commits are already presents in the target branch. In that case git-rebase correctly drops those (already present) commits but it also drops the notes associated with them. Can the notes be t