From: Eli Zaretskii <eliz@gnu.org>
To: emacs-devel@gnu.org
Subject: Strange response after merge from upstream
Date: Tue, 01 Dec 2009 21:20:50 +0200 [thread overview]
Message-ID: <833a3umrfx.fsf@gnu.org> (raw)
I created a repository with a trunk/ and quickfixes/ branches in it,
just like the wiki says. I waited a day without making any
modifications in quickfixes/ (it looks like the bzr repository is only
updated once a day), and then did a "bzr pull" in trunk/ and "bzr
merge; bzr commit" in quickfixes/. Strangely, "bzr missing" after
that in quickfixes/ says I "have 1 extra revision(s)" and shows all
the files merged from the trunk. Is that expected? it surprised me,
because I thought the result would be a branch that is an exact copy
of the trunk, and thus has no "extra revision(s)".
next reply other threads:[~2009-12-01 19:20 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-01 19:20 Eli Zaretskii [this message]
2009-12-01 22:04 ` Strange response after merge from upstream Stefan Monnier
2009-12-01 22:21 ` Andreas Schwab
2009-12-02 1:54 ` Stefan Monnier
2009-12-02 2:09 ` Óscar Fuentes
2009-12-02 4:29 ` Stefan Monnier
2009-12-02 10:48 ` Andreas Schwab
2009-12-01 22:23 ` Alexander Belchenko
2009-12-02 4:15 ` Eli Zaretskii
2009-12-02 4:56 ` Óscar Fuentes
2009-12-02 5:58 ` Eli Zaretskii
2009-12-02 6:26 ` Óscar Fuentes
2009-12-02 10:53 ` Eli Zaretskii
2009-12-02 14:31 ` Stefan Monnier
2009-12-02 17:40 ` Eli Zaretskii
2009-12-02 6:14 ` Stephen J. Turnbull
2009-12-02 7:05 ` Óscar Fuentes
2009-12-02 14:29 ` Stefan Monnier
2009-12-02 17:44 ` Óscar Fuentes
2009-12-02 19:37 ` Stefan Monnier
2009-12-02 17:55 ` Alexander Belchenko
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=833a3umrfx.fsf@gnu.org \
--to=eliz@gnu.org \
--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.