[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Strange response after merge from upstream
From: |
Alexander Belchenko |
Subject: |
Re: Strange response after merge from upstream |
Date: |
Wed, 02 Dec 2009 00:23:46 +0200 |
User-agent: |
Thunderbird 2.0.0.23 (Windows/20090812) |
Eli Zaretskii пишет:
> 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)".
Yes, after merge you did commit, therefore you have 1 extra revision (just
committed).
You may want to use `bzr merge --pull` to get equivalent of git fast-forward
merge.
merge --pull will pull new changes from other branch if possible, thus make
your branch a copy of
the other branch. Or it will do merge when 2 branches are diverged, i.e. both
branches has new
commits, not present in other branch.
Re: Strange response after merge from upstream,
Alexander Belchenko <=
- Re: Strange response after merge from upstream, Eli Zaretskii, 2009/12/01
- Re: Strange response after merge from upstream, Óscar Fuentes, 2009/12/01
- Re: Strange response after merge from upstream, Eli Zaretskii, 2009/12/02
- Re: Strange response after merge from upstream, Óscar Fuentes, 2009/12/02
- Re: Strange response after merge from upstream, Eli Zaretskii, 2009/12/02
- Re: Strange response after merge from upstream, Stefan Monnier, 2009/12/02
- Re: Strange response after merge from upstream, Eli Zaretskii, 2009/12/02
Re: Strange response after merge from upstream, Stephen J. Turnbull, 2009/12/02
Re: Strange response after merge from upstream, Óscar Fuentes, 2009/12/02
Re: Strange response after merge from upstream, Stefan Monnier, 2009/12/02