unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Subject: NEVER use `bzr push' for sending changes upstream (was: merge conlict?)
Date: Mon, 25 Jan 2010 14:54:48 +0100	[thread overview]
Message-ID: <87eile1e8n.fsf_-_@telefonica.net> (raw)
In-Reply-To: 83tyua5y8r.fsf@gnu.org

Eli Zaretskii <eliz@gnu.org> writes:

[snip]

> (Btw, mhershberger@intrahealth.org bounces.)

Mark did "merge & push" twice, so it is very likely that that is his
usual workflow. It is *very* damaging for the VC history.

If Mark can't be contacted for telling him to correct his bzr workflow,
his commit rights should be removed. Hopefully he will come here to ask
why he can't commit and then we will explain the problem to him.





  reply	other threads:[~2010-01-25 13:54 UTC|newest]

Thread overview: 100+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <E1NZJ1t-00089o-ST@monty-python.gnu.org>
2010-01-25  7:43 ` merge conlict? Eli Zaretskii
2010-01-25  8:46   ` Glenn Morris
2010-01-25  9:29     ` Eli Zaretskii
2010-01-25 13:54       ` Óscar Fuentes [this message]
2010-01-25 17:29         ` NEVER use `bzr push' for sending changes upstream Mark A. Hershberger
2010-01-25 18:28           ` Óscar Fuentes
2010-01-25  9:26   ` merge conlict? Andreas Schwab
2010-01-25 10:08     ` Eli Zaretskii
2010-01-25 10:19       ` Andreas Schwab
2010-01-25 10:30         ` Óscar Fuentes
2010-01-25 11:06           ` Andreas Schwab
2010-01-25 11:14             ` Eli Zaretskii
2010-01-25 11:27             ` Óscar Fuentes
2010-01-25 11:55               ` Teemu Likonen
2010-01-25 12:22                 ` Óscar Fuentes
2010-01-25 12:34                   ` Andreas Schwab
2010-01-25 12:48                     ` Óscar Fuentes
2010-01-25 13:00                       ` Andreas Schwab
2010-01-25 13:38                         ` Óscar Fuentes
2010-01-25 14:26                           ` Andreas Schwab
2010-01-25 14:39                             ` Óscar Fuentes
2010-01-25 15:47                               ` Andreas Schwab
2010-01-25 15:57                                 ` Óscar Fuentes
2010-01-25 16:10                                   ` Andreas Schwab
2010-01-25 18:06                                     ` Óscar Fuentes
2010-01-25 18:10                                       ` Andreas Schwab
2010-01-25 18:24                                         ` Óscar Fuentes
2010-01-25 18:31                                           ` Andreas Schwab
2010-01-25 18:50                                             ` Óscar Fuentes
2010-01-25 19:09                                               ` Andreas Schwab
2010-01-25 19:21                                                 ` Óscar Fuentes
2010-01-25 19:39                                                   ` Andreas Schwab
2010-01-25 20:07                                                     ` Óscar Fuentes
2010-01-25 20:56                                                       ` Andreas Schwab
2010-01-25 21:24                                                         ` Óscar Fuentes
2010-01-25 21:44                                                           ` Andreas Schwab
2010-01-25 23:19                                                             ` Óscar Fuentes
2010-01-25 23:54                                                               ` Andreas Schwab
2010-01-25 23:57                                                                 ` Óscar Fuentes
2010-01-26  2:02                                                               ` Stefan Monnier
2010-01-26  9:08                                                                 ` Eli Zaretskii
2010-01-26 15:11                                                                   ` Stefan Monnier
2010-01-26 18:11                                                                     ` Eli Zaretskii
2010-01-26 15:15                                                                   ` Karl Fogel
2010-01-26 17:13                                                                     ` Stephen J. Turnbull
2010-01-26 17:09                                                                       ` Karl Fogel
2010-01-26 18:14                                                                     ` Eli Zaretskii
2010-01-25 22:10                                                           ` David Reitter
2010-01-25 23:35                                                             ` Óscar Fuentes
2010-01-26  0:03                                                               ` Andreas Schwab
2010-01-26  1:38                                                             ` Stephen J. Turnbull
2010-01-26  4:30                                                               ` David Reitter
2010-01-25 13:41                   ` Teemu Likonen
2010-01-25 13:52                     ` Thierry Volpiatto
2010-01-25 12:30                 ` Óscar Fuentes
2010-01-26  0:05           ` Richard Stallman
2010-01-26  1:49             ` Stephen J. Turnbull
2010-01-26  4:25               ` Eli Zaretskii
2010-01-26  9:16                 ` Andreas Schwab
2010-01-26 10:31                   ` Eli Zaretskii
2010-01-26 10:51                     ` Andreas Schwab
2010-01-26 10:06               ` Óscar Fuentes
2010-01-26 16:49               ` Richard Stallman
2010-01-26 16:49               ` Richard Stallman
2010-01-26 17:50                 ` Eli Zaretskii
2010-01-26 18:20                   ` Lennart Borgman
2010-01-26 18:42                     ` Karl Fogel
2010-01-26 19:10                       ` Eli Zaretskii
2010-01-26 19:38                       ` Stephen J. Turnbull
2010-01-26 22:43                   ` Richard Stallman
2010-01-27  1:18                     ` Stefan Monnier
2010-01-27  4:08                       ` Eli Zaretskii
2010-01-25 10:30         ` Eli Zaretskii
2010-01-25 10:51           ` Andreas Schwab
2010-01-25 11:09             ` Eli Zaretskii
2010-01-25 12:36               ` Andreas Schwab
2010-01-25 12:43                 ` Óscar Fuentes
2010-01-25 10:27       ` Óscar Fuentes
2010-01-26  3:02     ` Stefan Monnier
2010-01-26  8:38       ` Eli Zaretskii
2010-01-26  9:29       ` Andreas Schwab
2010-01-26 10:10         ` Óscar Fuentes
2010-01-26 10:28           ` Andreas Schwab
2010-01-26 12:40           ` Andreas Schwab
2010-01-25 11:33   ` Teemu Likonen
2010-01-25 12:02     ` Eli Zaretskii
2010-01-25 12:38       ` Andreas Schwab
2010-01-25 13:17       ` Teemu Likonen
2010-01-25 14:22         ` Eli Zaretskii
2010-01-25 14:03     ` Interpreting git diff --cc [was: merge conlict?] Stephen J. Turnbull
2010-01-26  0:05     ` merge conlict? Richard Stallman
2010-01-26  0:04   ` Richard Stallman
2010-01-26  2:14     ` Stephen J. Turnbull
2010-01-26  4:26     ` Eli Zaretskii
2010-01-26 16:50       ` Richard Stallman
2010-01-26 17:53         ` Eli Zaretskii
2010-01-28  2:10   ` Katsumi Yamaoka
2010-01-28  4:03     ` Eli Zaretskii
2010-01-28  4:13       ` Katsumi Yamaoka
2010-01-28  5:41         ` Eli Zaretskii

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=87eile1e8n.fsf_-_@telefonica.net \
    --to=ofv@wanadoo.es \
    --cc=emacs-devel@gnu.org \
    /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).