From: Uday S Reddy <u.s.reddy@cs.bham.ac.uk>
To: emacs-devel@gnu.org
Subject: Re: base
Date: Mon, 23 Aug 2010 11:38:19 +0100 [thread overview]
Message-ID: <i4tj2q$lks$1@dough.gmane.org> (raw)
In-Reply-To: <E1OnATN-00066X-0m@fencepost.gnu.org>
Eli Zaretskii wrote:
> The bzr docs include a section on rebasing as well:
>
> http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/adv_merging.html
>
> (look near the end).
Indeed, the last paragraph explains the attitude of Bazaar developers:
Note: Some _users coming from central VCS tools_ with poor merge tracking
like rebasing because it’s similar to how they are use to working in older
tools, or because _“perfectly clean” history seems important_. Before
rebasing in Bazaar, think about whether a normal merge is a better choice.
[Emphasis added]
I don't have any trouble with the next sentence:
In particular, rebasing a private branch before sharing it is OK but rebasing
after sharing a branch with someone else is strongly discouraged.
Here is Linus Torlvalds explaining this point in more detail:
http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html
Cheers,
Uday
next prev parent reply other threads:[~2010-08-23 10:38 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-22 12:06 base Alan Mackenzie
2010-08-22 12:20 ` base Eli Zaretskii
2010-08-22 13:01 ` base Alan Mackenzie
2010-08-22 12:50 ` base Teemu Likonen
2010-08-22 13:20 ` base Eli Zaretskii
2010-08-23 10:38 ` Uday S Reddy [this message]
2010-08-23 11:03 ` base Leo
2010-08-23 12:56 ` base Eli Zaretskii
2010-08-24 4:32 ` base Richard Stallman
2010-08-24 6:01 ` base Stephen J. Turnbull
2010-08-24 7:22 ` base Leo
2010-08-24 8:29 ` base Andreas Schwab
2010-08-24 8:34 ` base Stephen J. Turnbull
2010-08-24 9:10 ` base Miles Bader
2010-08-24 10:03 ` base Juanma Barranquero
2010-08-24 13:39 ` base Stephen J. Turnbull
2010-08-24 14:05 ` base Miles Bader
2010-08-24 15:00 ` base Andreas Schwab
2010-08-24 16:14 ` base Juanma Barranquero
2010-08-24 12:32 ` base Stephen J. Turnbull
2010-08-24 12:51 ` base Leo
2010-08-24 13:39 ` base Juanma Barranquero
2010-08-24 14:25 ` base Óscar Fuentes
2010-08-24 16:18 ` base Juanma Barranquero
2010-08-24 14:37 ` base David Kastrup
2010-08-24 16:22 ` base Juanma Barranquero
2010-08-24 16:38 ` base David Kastrup
2010-08-24 17:22 ` base Juanma Barranquero
2010-08-24 17:35 ` base Stephen J. Turnbull
2010-08-24 17:45 ` base Frank Schmitt
2010-08-25 4:33 ` base Stephen J. Turnbull
2010-08-25 6:38 ` base Eli Zaretskii
2010-08-25 8:48 ` base Stephen J. Turnbull
2010-08-25 9:02 ` base Eli Zaretskii
2010-08-25 13:17 ` base Stephen J. Turnbull
2010-08-25 18:12 ` base Eli Zaretskii
2010-08-25 20:34 ` base Óscar Fuentes
2010-08-25 20:43 ` base Bernardo Barros
2010-08-25 20:55 ` base Eli Zaretskii
2010-08-24 18:00 ` base Leo
2010-08-24 19:04 ` base Juanma Barranquero
2010-08-24 23:44 ` base Miles Bader
2010-08-24 23:48 ` base Juanma Barranquero
2010-08-25 0:19 ` base Miles Bader
2010-08-25 3:13 ` base Eli Zaretskii
2010-08-25 3:44 ` base Miles Bader
2010-08-25 5:46 ` base Eli Zaretskii
2010-08-25 8:15 ` base Stephen J. Turnbull
2010-08-25 9:35 ` base Uday S Reddy
2010-08-25 10:43 ` base Juanma Barranquero
2010-08-25 15:34 ` base Stephen J. Turnbull
2010-08-25 11:21 ` base Eli Zaretskii
2010-08-25 13:13 ` base Óscar Fuentes
2010-08-25 15:11 ` base Harald Hanche-Olsen
2010-08-25 19:08 ` base Eli Zaretskii
2010-08-25 19:07 ` base Eli Zaretskii
2010-08-25 21:06 ` base Óscar Fuentes
2010-08-26 3:10 ` base Eli Zaretskii
2010-08-26 3:27 ` base Miles Bader
2010-08-26 3:29 ` base Miles Bader
2010-08-26 5:37 ` base Eli Zaretskii
2010-08-26 6:29 ` base Leo
2010-08-26 8:23 ` base Uday S Reddy
2010-08-26 9:16 ` base Eli Zaretskii
2010-08-26 12:25 ` base Uday S Reddy
2010-08-26 12:35 ` base Eli Zaretskii
2010-08-26 13:27 ` base Óscar Fuentes
2010-08-26 13:49 ` base Eli Zaretskii
2010-08-26 14:42 ` base Óscar Fuentes
2010-08-26 15:11 ` base David Robinow
2010-08-26 15:50 ` base Óscar Fuentes
2010-08-26 15:28 ` base David Kastrup
2010-08-27 5:33 ` base Stephen J. Turnbull
2010-08-27 13:25 ` base Óscar Fuentes
2010-08-28 15:18 ` base Stephen J. Turnbull
2010-08-26 11:01 ` base Stephen J. Turnbull
2010-08-26 17:08 ` base Eli Zaretskii
2010-08-27 13:03 ` base Stephen J. Turnbull
2010-08-27 13:52 ` base Eli Zaretskii
2010-08-27 14:25 ` base Miles Bader
2010-08-27 15:25 ` base Eli Zaretskii
2010-08-28 16:25 ` base Stephen J. Turnbull
2010-08-28 17:32 ` base Eli Zaretskii
2010-08-28 18:58 ` base Leo
2010-08-28 19:58 ` base Eli Zaretskii
2010-08-28 22:51 ` base Leo
2010-08-28 19:16 ` base Stephen J. Turnbull
2010-08-28 20:00 ` base Eli Zaretskii
2010-08-29 12:21 ` base Stephen J. Turnbull
2010-08-26 18:09 ` base Uday S Reddy
2010-08-25 16:09 ` base Stephen J. Turnbull
2010-08-25 18:51 ` base Eli Zaretskii
2010-08-26 10:25 ` base Stephen J. Turnbull
2010-08-26 11:26 ` base Eli Zaretskii
2010-08-26 11:52 ` base Leo
2010-08-27 5:43 ` base Stephen J. Turnbull
2010-08-27 6:57 ` base Eli Zaretskii
2010-08-27 7:06 ` base David Kastrup
2010-08-27 13:16 ` base Óscar Fuentes
2010-08-25 7:38 ` base Leo
2010-08-25 7:41 ` base Juanma Barranquero
2010-08-25 13:23 ` base Teemu Likonen
2010-08-25 9:07 ` base Uday S Reddy
2010-08-24 14:09 ` base Miles Bader
2010-08-24 14:13 ` base Miles Bader
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='i4tj2q$lks$1@dough.gmane.org' \
--to=u.s.reddy@cs.bham.ac.uk \
--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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.