Re: Installing changes from branches

[Eli Zaretskii]

> From: Óscar Fuentes <address@hidden>
> Date: Sat, 03 Apr 2010 18:56:41 +0200
> 
> If you use `bzr diff' and `patch' for incorporating your changes into
> `trunk', bzr is unable to track.

I obviously failed to drive the point home: in this workflow, I don't
_want_ bzr to track these changes.  I want them to look like changes
I made directly on the trunk.

> So you `bzr diff -rsubmit:' will generate a diff as if you had never
> incorporated your local changes into `trunk'.

After invoking `patch', there's a commit, so how can you say I never
"incorporated the changes into `trunk'"?  Perhaps you mean "merge"
instead of "incorporate".  In the latter case, that's exactly what I
want: it does what Stefan asked for -- avoid numerous merge commits on
the trunk when they bear no importance (due to insignificant amount of
real changes).