[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Installing changes from branches
From: |
Eli Zaretskii |
Subject: |
Re: Installing changes from branches |
Date: |
Sat, 03 Apr 2010 23:53:14 +0300 |
> 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).
- Re: Installing changes from branches, (continued)
- 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, 2010/04/03
- 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 <=
- 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
- Re: Installing changes from branches, Eli Zaretskii, 2010/04/03
- Re: Installing changes from branches, Juri Linkov, 2010/04/03
- Re: Installing changes from branches, Eli Zaretskii, 2010/04/04
- Re: Installing changes from branches, Juri Linkov, 2010/04/04
- Re: Installing changes from branches, Stefan Monnier, 2010/04/04
- Re: Installing changes from branches, Stefan Monnier, 2010/04/04
- Re: Installing changes from branches, Eli Zaretskii, 2010/04/04