[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Installing changes from branches
From: |
Stefan Monnier |
Subject: |
Re: Installing changes from branches |
Date: |
Sat, 03 Apr 2010 10:08:11 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
> That is OK. I didn't even know comments got merged like this.
> Isn't the real problem that bzr requires a commit in the quickfix branch
> after a merge?
Bzr doesn't require any such thing. You decided to commit, not bzr.
That's linked to the fact that you decided to use "merge" rather than
"pull", i.e. use a separate branch.
> If you are doing some work that takes time, I find it easier to merge
> from the trunk from time to time, rather than taking a big hit at
> the end.
There are many different ways to do it. I suggested a few in the part
of the message you elided:
- "For such changes, it's a lot better to just take the diff from the
branch, apply to the trunk and commit". That's what I do, as a matter
of fact, and I have grown to like it, since this "diff&patch" is
a good opportunity to rework/cleanup the patch one last time before
committing it.
- "Or to use "bzr rebase" instead".
- "Another very good solution is to not use quickfix branches at all, but
use shelves instead".
> Something like a collapsed merge would be good, i.e. merge from quickfix,
> but only record it as a single commit.
Indeed, you can also do that:
cd .../trunk
bzr merge .../quickfix
bzr revert --forget-merges
bzr commit ...
that's virtually the same as "diff&patch": it forgets all about the
branch's history.
Stefan
- Re: Installing changes from branches, (continued)
- Re: Installing changes from branches, Óscar Fuentes, 2010/04/02
- Re: Installing changes from branches, Eli Zaretskii, 2010/04/03
- Re: Installing changes from branches, Stefan Monnier, 2010/04/03
- Re: Installing changes from branches, Óscar Fuentes, 2010/04/03
- Re: Installing changes from branches, Eli Zaretskii, 2010/04/03
- Re: Installing changes from branches, Óscar Fuentes, 2010/04/03
- Re: Installing changes from branches, Eli Zaretskii, 2010/04/03
Re: Installing changes from branches, Juanma Barranquero, 2010/04/02
Re: Installing changes from branches, Jan Djärv, 2010/04/03
- Re: Installing changes from branches, Stephen J. Turnbull, 2010/04/03
- Re: Installing changes from branches,
Stefan Monnier <=
- Re: Installing changes from branches, Óscar Fuentes, 2010/04/03
- Re: Installing changes from branches, Jan Djärv, 2010/04/03
- Re: Installing changes from branches, Óscar Fuentes, 2010/04/03
- Re: Installing changes from branches, Eli Zaretskii, 2010/04/03
- Re: Installing changes from branches, Eli Zaretskii, 2010/04/03
- Re: Installing changes from branches, Óscar Fuentes, 2010/04/03
- Re: Installing changes from branches, Eli Zaretskii, 2010/04/03
- Re: Installing changes from branches, Óscar Fuentes, 2010/04/03
Re: Installing changes from branches, Stefan Monnier, 2010/04/03
Re: Installing changes from branches, Juanma Barranquero, 2010/04/03