* New emacs-24 branch
@ 2012-04-07 4:08 Stefan Monnier
2012-04-07 8:52 ` Andreas Schwab
2012-04-07 16:57 ` Lars Magne Ingebrigtsen
0 siblings, 2 replies; 6+ messages in thread
From: Stefan Monnier @ 2012-04-07 4:08 UTC (permalink / raw)
To: emacs-devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: New emacs-24 branch
2012-04-07 4:08 New emacs-24 branch Stefan Monnier
@ 2012-04-07 8:52 ` Andreas Schwab
2012-04-07 16:57 ` Lars Magne Ingebrigtsen
1 sibling, 0 replies; 6+ messages in thread
From: Andreas Schwab @ 2012-04-07 8:52 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
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."
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: New emacs-24 branch
2012-04-07 4:08 New emacs-24 branch Stefan Monnier
2012-04-07 8:52 ` Andreas Schwab
@ 2012-04-07 16:57 ` Lars Magne Ingebrigtsen
2012-04-07 17:39 ` Andreas Schwab
2012-04-07 17:53 ` Eli Zaretskii
1 sibling, 2 replies; 6+ messages in thread
From: Lars Magne Ingebrigtsen @ 2012-04-07 16:57 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
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/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: New emacs-24 branch
2012-04-07 16:57 ` Lars Magne Ingebrigtsen
@ 2012-04-07 17:39 ` Andreas Schwab
2012-04-07 17:53 ` Eli Zaretskii
1 sibling, 0 replies; 6+ messages in thread
From: Andreas Schwab @ 2012-04-07 17:39 UTC (permalink / raw)
To: Lars Magne Ingebrigtsen; +Cc: Stefan Monnier, emacs-devel
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."
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: New emacs-24 branch
2012-04-07 16:57 ` Lars Magne Ingebrigtsen
2012-04-07 17:39 ` Andreas Schwab
@ 2012-04-07 17:53 ` Eli Zaretskii
2012-04-07 18:01 ` Lars Magne Ingebrigtsen
1 sibling, 1 reply; 6+ messages in thread
From: Eli Zaretskii @ 2012-04-07 17:53 UTC (permalink / raw)
To: Lars Magne Ingebrigtsen; +Cc: monnier, emacs-devel
> 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: New emacs-24 branch
2012-04-07 17:53 ` Eli Zaretskii
@ 2012-04-07 18:01 ` Lars Magne Ingebrigtsen
0 siblings, 0 replies; 6+ messages in thread
From: Lars Magne Ingebrigtsen @ 2012-04-07 18:01 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: monnier, emacs-devel
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/
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-04-07 18:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-07 4:08 New emacs-24 branch Stefan Monnier
2012-04-07 8:52 ` Andreas Schwab
2012-04-07 16:57 ` Lars Magne Ingebrigtsen
2012-04-07 17:39 ` Andreas Schwab
2012-04-07 17:53 ` Eli Zaretskii
2012-04-07 18:01 ` Lars Magne Ingebrigtsen
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).