From: Eli Zaretskii <eliz@gnu.org>
To: rms@gnu.org
Cc: bojan@bnikolic.co.uk, emacs-devel@gnu.org
Subject: Re: Bzr document unclear. There is no "conflict markers".
Date: Mon, 04 Jan 2010 06:08:59 +0200 [thread overview]
Message-ID: <83y6kecy04.fsf@gnu.org> (raw)
In-Reply-To: <E1NRYUR-0001UF-Ho@fencepost.gnu.org>
> From: Richard Stallman <rms@gnu.org>
> Date: Sun, 03 Jan 2010 16:59:59 -0500
> Cc: emacs-devel@gnu.org
>
> I think it is usually better do the merge first (and resolve any
> possible conflicts) before making the edits that make up your fix.
>
> I find that hard to understand. If you have not yet edited the file,
> what is there to merge?
For the first edit ever in that branch, you are right. But once you
begin working there, the histories of the branch and the trunk
diverge, so a merge is necessary. Note that "merge" in Bazaar is not
just the merge of the files' contents, it is (AFAIU) also the merge of
histories of the branch and trunk, i.e. the DAG that represents the
history of each of the two trees is merged to include both.
next prev parent reply other threads:[~2010-01-04 4:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-03 12:44 Bzr document unclear. There is no "conflict markers" Jan Djärv
2010-01-03 13:39 ` Eli Zaretskii
2010-01-03 14:33 ` Jan Djärv
2010-01-03 15:10 ` Eli Zaretskii
2010-01-03 19:17 ` Jan Djärv
2010-01-03 19:25 ` Eli Zaretskii
2010-01-04 0:14 ` Jan Djärv
2010-01-03 15:24 ` Bojan Nikolic
2010-01-03 21:59 ` Richard Stallman
2010-01-03 22:36 ` Bojan Nikolic
2010-01-04 16:23 ` Richard Stallman
2010-01-04 17:08 ` Stefan Monnier
2010-01-04 20:07 ` Bojan Nikolic
2010-01-04 4:08 ` Eli Zaretskii [this message]
2010-01-04 16:23 ` Richard Stallman
2010-01-04 18:27 ` 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=83y6kecy04.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=bojan@bnikolic.co.uk \
--cc=emacs-devel@gnu.org \
--cc=rms@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).