Re: Installing changes from branches

[Jan Djärv]

Stefan Monnier skrev 2010-04-03 03.05:
> I noticed recently that some people install small changes
> from "quickfix branches" by something like:
>
>    cd .../trunk
>    bzr merge .../quickfix
>    bzr commit ...
>
> This is fine if the quickfix has only a single commit or OTOH is a long
> running branch with many different real commits.  But not if the branch
> has barely more than 1 real commit plus various "merge from trunk".
> E.g.:
>
>     revno: 99807 [merge]
>     committer: Jan D.<address@hidden>
>     branch nick: trunk
>     timestamp: Fri 2010-04-02 11:46:07 +0200
>     message:
>       * tmm.el (tmm-get-keymap): Check with symbolp before passing value to 
> fboundp.
>         ------------------------------------------------------------
>         revno: 99248.1.60 [merge]
>         committer: Jan D.<address@hidden>
>         branch nick: fixes
>         timestamp: Fri 2010-04-02 11:45:27 +0200
>         message:
>           Merge from trunk
>         ------------------------------------------------------------
>         revno: 99248.1.59
>         committer: Jan D.<address@hidden>
>         branch nick: fixes
>         timestamp: Fri 2010-04-02 11:44:50 +0200
>         message:
>           tmm.el (tmm-get-keymap): Check with symbolp before passing
>           value to fboundp, it may not be a symbol.
>         ------------------------------------------------------------
>         revno: 99248.1.58 [merge]
>         committer: Jan D.<address@hidden>
>         branch nick: fixes
>         timestamp: Thu 2010-04-01 08:50:44 +0200
>         message:
>           Merge from trunk
>         ------------------------------------------------------------
>         revno: 99248.1.57 [merge]
>         committer: Jan D.<address@hidden>
>         branch nick: fixes
>         timestamp: Fri 2010-03-26 08:01:19 +0100
>         message:
>           Merge from trunk
>         ------------------------------------------------------------
>         revno: 99248.1.56 [merge]
>         committer: Jan D.<address@hidden>
>         branch nick: fixes
>         timestamp: Tue 2010-03-23 20:32:31 +0100
>         message:
>           Merge from trunk
>         ------------------------------------------------------------
>         revno: 99248.1.55 [merge]
>         committer: Jan D.<address@hidden>
>         branch nick: fixes
>         timestamp: Tue 2010-03-23 08:04:35 +0100
>         message:
>           Merge from trunk
>
> [ Please Jan, don't take it personally, it's just an example. ]

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?  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.

Something like a collapsed merge would be good, i.e. merge from quickfix, but 
only record it as a single commit.

        Jan D.