From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Bastien <bzg@gnu.org>
Cc: "Óscar Fuentes" <ofv@wanadoo.es>, emacs-devel@gnu.org
Subject: Re: patch vs. overwrite in bzr
Date: Tue, 03 Apr 2012 12:31:42 -0400 [thread overview]
Message-ID: <jwvmx6s234l.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87aa2szwl9.fsf_-_@engster.org> (David Engster's message of "Tue, 03 Apr 2012 17:03:30 +0200")
> In a nutshell: It's more or less a GUI to do cherry picking with bzr and
> marking commits as 'applied', 'ignored' etc. and saving that state in
> the repository between sessions. In the end it will work in both
> directions, but currently I'm concentrating on the Emacs -> CEDET, since
> this will be the first thing to do next. Also, for the other direction
> we will probably use a dedicated branch like 'for-emacs' or something
> like that and not directly push into Emacs.
The Gnus guys also do two-way syncing and have to solve the same
problem. A generic tool would be awesome. I think two-way syncing of
branches is a major problem with current VCS technology and I'm eagerly
awaiting a good generic solution to it. I'm sure I'm not the only one.
Even better if it can be run from a cron job (i.e. fully automatic and
deals with conflicts somehow (obviously, it can't resolve them, so it
needs to store them somewhere, make sure someone will see them and will
be able to resolve them, ...)).
Stefan
next prev parent reply other threads:[~2012-04-03 16:31 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-22 13:28 Next pretest, and regressions policy Chong Yidong
2012-03-31 10:15 ` Bastien
2012-04-01 9:55 ` Bastien
2012-04-01 12:37 ` =?utf-8?Q?=C3=93scar_Fuentes?=
2012-04-01 13:30 ` Stefan Monnier
2012-04-01 17:09 ` Chong Yidong
2012-04-01 20:32 ` Bastien
2012-04-02 4:12 ` Chong Yidong
2012-04-01 20:32 ` Bastien
2012-04-03 8:20 ` patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Roland Winkler
2012-04-03 12:36 ` Óscar Fuentes
2012-04-03 13:42 ` Bastien
2012-04-03 15:02 ` patch vs. overwrite in bzr =?utf-8?Q?=C3=93scar_Fuentes?=
2012-04-03 15:03 ` David Engster
2012-04-03 16:31 ` Stefan Monnier [this message]
2012-04-03 17:40 ` Michael Albinus
2012-04-03 15:32 ` patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Stefan Monnier
2012-04-03 16:52 ` patch vs. overwrite in bzr Glenn Morris
2012-04-03 20:50 ` Bastien
2012-04-03 21:27 ` Glenn Morris
2012-04-04 0:26 ` Stefan Monnier
2012-04-04 5:45 ` Bastien
2012-04-04 5:51 ` Bastien
2012-04-04 6:46 ` Michael Albinus
2012-04-04 8:35 ` Thierry Volpiatto
2012-04-04 13:20 ` Stefan Monnier
2012-04-04 16:39 ` Jordi Gutiérrez Hermoso
2012-04-04 16:52 ` Paul Eggert
2012-04-04 17:09 ` Eli Zaretskii
2012-04-04 17:53 ` Thierry Volpiatto
2012-04-04 19:07 ` Eli Zaretskii
2012-04-04 19:38 ` Thierry Volpiatto
2012-04-04 20:12 ` Eli Zaretskii
2012-04-04 13:16 ` Stefan Monnier
2012-04-04 17:01 ` Eli Zaretskii
2012-04-04 18:07 ` Stefan Monnier
2012-04-04 19:11 ` Eli Zaretskii
2012-04-04 20:11 ` David Engster
2012-04-04 22:06 ` Stefan Monnier
2012-04-05 3:09 ` Eli Zaretskii
2012-04-05 13:22 ` Stefan Monnier
2012-04-05 15:24 ` Lars Magne Ingebrigtsen
2012-04-05 15:57 ` Eli Zaretskii
2012-04-05 17:10 ` Ted Zlatanov
2012-04-06 7:13 ` Richard Stallman
2012-04-06 8:29 ` Bastien
2012-04-06 8:40 ` Eli Zaretskii
2012-04-06 9:20 ` Bastien
2012-04-06 9:57 ` Eli Zaretskii
2012-04-06 10:20 ` Bastien
2012-04-06 17:26 ` chad
2012-04-06 20:01 ` joakim
2012-04-06 20:52 ` Eli Zaretskii
2012-04-07 2:28 ` Óscar Fuentes
2012-04-07 6:33 ` Eli Zaretskii
2012-04-07 11:56 ` Óscar Fuentes
2012-04-07 12:10 ` Eli Zaretskii
2012-04-07 12:56 ` Óscar Fuentes
2012-04-07 13:32 ` Eli Zaretskii
2012-04-07 13:42 ` Óscar Fuentes
2012-04-07 7:07 ` Andreas Schwab
2012-04-07 11:44 ` Óscar Fuentes
2012-04-06 21:10 ` Juanma Barranquero
2012-04-16 10:45 ` Jason Rumney
2012-04-16 16:38 ` Eli Zaretskii
2012-04-06 16:17 ` Christophe Poncy
2012-04-06 16:41 ` Eli Zaretskii
2012-04-06 17:14 ` Christophe Poncy
2012-04-07 0:17 ` Richard Stallman
2012-04-07 0:17 ` Richard Stallman
2012-04-07 9:15 ` Bastien
2012-04-07 22:19 ` Richard Stallman
2012-04-09 9:39 ` Bastien
2012-04-08 3:25 ` Richard Stallman
2012-04-08 15:52 ` Ted Zlatanov
2012-04-16 22:02 ` Richard Stallman
2012-04-06 8:43 ` Eli Zaretskii
2012-04-04 17:12 ` patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Eli Zaretskii
2012-04-05 7:13 ` Bastien
2012-04-05 15:53 ` Eli Zaretskii
2012-04-11 14:36 ` Bastien
2012-04-04 18:01 ` Thierry Volpiatto
2012-04-05 7:19 ` Bastien
2012-04-05 9:16 ` Thierry Volpiatto
2012-04-01 20:35 ` Next pretest, and regressions policy Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvmx6s234l.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=bzg@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).