Upstream tracking

[Raghavendra D Prabhu]

Hi,

I see that mutt (hg) -- http://dev.mutt.org/hg/mutt/ -- seems to 
be active again. So, are these upstream changes merged into mutt-kz periodically?

Regards,

[Karel Zak]

On Fri, Jan 04, 2013 at 06:47:30PM +0530, Raghavendra D Prabhu wrote:
> I see that mutt (hg) -- http://dev.mutt.org/hg/mutt/ -- seems to be active

wow ;-)
> again. So, are these upstream changes merged into mutt-kz periodically?

Good point, any volunteer to create a *git* branch with the new
 patches? ... if not, than I'll try to fight with hg later in January.

Karel

[Víctor M. Jáquez L.]

On Mon, Jan 07, 2013 at 01:53:30PM +0100, Karel Zak wrote:
> On Fri, Jan 04, 2013 at 06:47:30PM +0530, Raghavendra D Prabhu wrote:
> > I see that mutt (hg) -- http://dev.mutt.org/hg/mutt/ -- seems to be active
>
> wow ;-)
> > again. So, are these upstream changes merged into mutt-kz periodically?
>
> Good point, any volunteer to create a *git* branch with the new
>  patches? ... if not, than I'll try to fight with hg later in January.

This might help

https://felipec.wordpress.com/2012/11/13/git-remote-hg-bzr-2/

vmjl
> Karel

[David Sterba]

On Mon, Jan 07, 2013 at 01:53:30PM +0100, Karel Zak wrote:
> On Fri, Jan 04, 2013 at 06:47:30PM +0530, Raghavendra D Prabhu wrote:
> > I see that mutt (hg) -- http://dev.mutt.org/hg/mutt/ -- seems to be active
> > again. So, are these upstream changes merged into mutt-kz periodically?
>
> Good point, any volunteer to create a *git* branch with the new
>  patches? ... if not, than I'll try to fight with hg later in January.

http://repo.or.cz/w/mutt-kz-devel.git/shortlog/refs/heads/upstream-2013-01-0...

I've been using it since, no problems so far. This is like 60 patches,
so I wanted to test it a bit before sending it to the list.

david

[Karel Zak]

On Mon, Jan 07, 2013 at 05:38:53PM +0100, David Sterba wrote:
> On Mon, Jan 07, 2013 at 01:53:30PM +0100, Karel Zak wrote:
> > On Fri, Jan 04, 2013 at 06:47:30PM +0530, Raghavendra D Prabhu wrote:
> > > I see that mutt (hg) -- http://dev.mutt.org/hg/mutt/ -- seems to be active
> > > again. So, are these upstream changes merged into mutt-kz periodically?
> >
> > Good point, any volunteer to create a *git* branch with the new
> >  patches? ... if not, than I'll try to fight with hg later in January.
>
> http://repo.or.cz/w/mutt-kz-devel.git/shortlog/refs/heads/upstream-2013-01-0...

Cool!!!
> I've been using it since, no problems so far. This is like 60 patches,
> so I wanted to test it a bit before sending it to the list.

It's probably unnecessary to spam the list in this case ;-) 
 I can pull from your repository.

Karel

[David Sterba]

On Tue, Jan 08, 2013 at 01:58:26PM +0100, Karel Zak wrote:
> > I've been using it since, no problems so far. This is like 60 patches,
> > so I wanted to test it a bit before sending it to the list.
>
> It's probably unnecessary to spam the list in this case ;-)

Sure, I'd send a warning first :)
> I can pull from your repository.

Not in a state to pull yet, I've mismerged some bits around sidebar, the
index/pager contents are not shifted right when sidebar is visible.

david

[Víctor M. Jáquez L.]

On Mon, Jan 07, 2013 at 03:25:33PM +0100, Víctor M. Jáquez L. wrote:
> On Mon, Jan 07, 2013 at 01:53:30PM +0100, Karel Zak wrote:
> > On Fri, Jan 04, 2013 at 06:47:30PM +0530, Raghavendra D Prabhu wrote:
> > > I see that mutt (hg) -- http://dev.mutt.org/hg/mutt/ -- seems to be active
> >
> > wow ;-)
> > > again. So, are these upstream changes merged into mutt-kz periodically?
> >
> > Good point, any volunteer to create a *git* branch with the new
> >  patches? ... if not, than I'll try to fight with hg later in January.
>
> This might help
>
> https://felipec.wordpress.com/2012/11/13/git-remote-hg-bzr-2/

Importing the current hg upstream using this tool, I managed to pull and
rebase the latest commits "as is" into here

https://github.com/ceyusa/mutt-kz/tree/upstream

As far as I've tested, it is working with the sidebar and so.

vmjl
> vmjl
> > Karel
>
> mutt-kz mailing list
> [e-mail]
> https://admin.fedoraproject.org/mailman/listinfo/mutt-kz

[Karel Zak]

On Sat, Jan 19, 2013 at 09:38:25PM +0100, Víctor M. Jáquez L. wrote:
> > This might help
> >
> > https://felipec.wordpress.com/2012/11/13/git-remote-hg-bzr-2/
>
> Importing the current hg upstream using this tool, I managed to pull and
> rebase the latest commits "as is" into here
>
> https://github.com/ceyusa/mutt-kz/tree/upstream
>
> As far as I've tested, it is working with the sidebar and so.

Yes, it seems it works and compile without warnings.

I have merged your ceyusa/mutt-kz/tree/upstream tree to mutt-kz
 upstream tree. Thanks!

Karel

[Víctor M. Jáquez L.]

On Fri, Jan 04, 2013 at 06:47:30PM +0530, Raghavendra D Prabhu wrote:
> Hi,
>
> I see that mutt (hg) -- http://dev.mutt.org/hg/mutt/ -- seems to be
> active again. So, are these upstream changes merged into mutt-kz
> periodically?

I was thinking, and I don't remember any previous discussion on this regard,
what about to merge mutt-kz patches into mutt?

The work implies the isolate our patches and make them mergeables into the
upstream hg repo.

Is it possible? Is it useful? What do you think?

vmjl
> Regards,
> mutt-kz mailing list
> [e-mail]
> https://admin.fedoraproject.org/mailman/listinfo/mutt-kz

[Ludwig]

On Wed, 10 Apr 2013, Víctor M. Jáquez L. wrote:
> I was thinking, and I don't remember any previous discussion on this regard,
> what about to merge mutt-kz patches into mutt?
>
> The work implies the isolate our patches and make them mergeables into the
> upstream hg repo.
>
> Is it possible? Is it useful? What do you think?

If I recall correctly, the mutt maintainers were adamantly against
incorporating at least the sidebar patch, which is why it’s existed as a
separate patch all this time.

[Karel Zak]

On Wed, Apr 10, 2013 at 11:25:38AM +0200, Víctor M. Jáquez L. wrote:
> On Fri, Jan 04, 2013 at 06:47:30PM +0530, Raghavendra D Prabhu wrote:
> > Hi,
> >
> > I see that mutt (hg) -- http://dev.mutt.org/hg/mutt/ -- seems to be
> > active again. So, are these upstream changes merged into mutt-kz
> > periodically?
>
> I was thinking, and I don't remember any previous discussion on this regard,
> what about to merge mutt-kz patches into mutt?
>
> The work implies the isolate our patches and make them mergeables into the
> upstream hg repo.
>
> Is it possible? Is it useful? What do you think?

It would be nice to merge something or all back into the original mutt,
 but I have doubts... for example sidebar patch exists for ~10 years.

But If you have time (I'm too busy with something else right now) you
 can try to discuss this topic with mutt upstream.

Karel