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 20:27:34 +0200 [thread overview]
Message-ID: <83tyv1d8tl.fsf@gnu.org> (raw)
In-Reply-To: <E1NRpin-0004rE-8x@fencepost.gnu.org>
> From: Richard Stallman <rms@gnu.org>
> CC: bojan@bnikolic.co.uk, emacs-devel@gnu.org
> Date: Mon, 04 Jan 2010 11:23:57 -0500
>
> 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.
>
> But after you commit your changes from the branch to the trunk,
> isn't everything in sync until you start to edit again?
Maybe in theory. Do you always commit _all_ your changes? don't you
sometimes leave some of them out because you are still working on them
or testing them? And what about all those ChangeLog entries you made
while working in the branch -- won't you rewrite them at least to some
extent for committing to the trunk?
Besides, personally I'm not even sure ``everything is in sync'' even
if you commit everything. I think that the DAG representing the
branch will still be different from the one representing the trunk,
due to local commits. Somebody who knows more about bzr internals,
please confirm or refute this.
prev parent reply other threads:[~2010-01-04 18:27 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
2010-01-04 16:23 ` Richard Stallman
2010-01-04 18:27 ` Eli Zaretskii [this message]
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=83tyv1d8tl.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 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.