New emacs-24 branch

New emacs-24 branch

[Stefan Monnier]

I have cut a new branch (name `emacs-24') from which the Emacs-24.1 will
be cut.  Any patch that fixes a regression in Emacs-24 should be applied
to this branch *instead* of being applied to the trunk (those patches
will be merged back onto the trunk every once in a while).

The `trunk' can now be used for non-regression patches.  For now, please
refrain from installing pervasive changes, tho, to avoid introducing
unneeded conflicts when merging from the branch.


        Stefan

Re: New emacs-24 branch

[Andreas Schwab]

I guess the version should be bumped in the trunk, shouldn't it?

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: New emacs-24 branch

[Lars Magne Ingebrigtsen]

Stefan Monnier <monnier@IRO.UMontreal.CA> writes:

> I have cut a new branch (name `emacs-24') from which the Emacs-24.1 will
> be cut.  Any patch that fixes a regression in Emacs-24 should be applied
> to this branch *instead* of being applied to the trunk (those patches
> will be merged back onto the trunk every once in a while).

This has possibly been covered before, but does anybody have a simple
recipe for how to work on this branch?

That is, I want to have two separate directories, "trunk" and
"emacs-24", and be able to work in each of them, and do "bzr update" in
each of them as normal.

-- 
(domestic pets only, the antidote for overdose, milk.)
  bloggy blog http://lars.ingebrigtsen.no/

Re: New emacs-24 branch

[Andreas Schwab]

Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> That is, I want to have two separate directories, "trunk" and
> "emacs-24", and be able to work in each of them, and do "bzr update" in
> each of them as normal.

What's wrong with bzr branch?

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: New emacs-24 branch

[Eli Zaretskii]

> From: Lars Magne Ingebrigtsen <larsi@gnus.org>
> Date: Sat, 07 Apr 2012 18:57:52 +0200
> Cc: emacs-devel@gnu.org
> 
> This has possibly been covered before, but does anybody have a simple
> recipe for how to work on this branch?
> 
> That is, I want to have two separate directories, "trunk" and
> "emacs-24", and be able to work in each of them, and do "bzr update" in
> each of them as normal.

From "trunk":

  cd ..
  bzr branch --bind bzr+ssh://USERNAME@bzr.savannah.gnu.org/emacs/emacs-24

This will create a directory "emacs-24" that is a sibling to "trunk",
and make it bound to the remote branch, so "bzr update" and "bzr ci"
will work in each one as you'd expect.

Re: New emacs-24 branch

[Lars Magne Ingebrigtsen]

Eli Zaretskii <eliz@gnu.org> writes:

>   cd ..
>   bzr branch --bind bzr+ssh://USERNAME@bzr.savannah.gnu.org/emacs/emacs-24
>
> This will create a directory "emacs-24" that is a sibling to "trunk",
> and make it bound to the remote branch, so "bzr update" and "bzr ci"
> will work in each one as you'd expect.

Thank you.

-- 
(domestic pets only, the antidote for overdose, milk.)
  bloggy blog http://lars.ingebrigtsen.no/