[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Strange response after merge from upstream

From: Stefan Monnier
Subject: Re: Strange response after merge from upstream
Date: Tue, 01 Dec 2009 17:04:53 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux)

> 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),

The bzr repository in svannah is not auto-updated at all, AFAIK.  Is it?

> 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)".

As you've made a "commit", you created a new revision which is not in
the upstream branch.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]