[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Installing changes from branches
From: |
Óscar Fuentes |
Subject: |
Re: Installing changes from branches |
Date: |
Sat, 03 Apr 2010 18:56:41 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
Eli Zaretskii <address@hidden> writes:
>> Date: Sat, 03 Apr 2010 19:29:56 +0300
>> From: Eli Zaretskii <address@hidden>
>> Cc: address@hidden
>>
>> cd ../test
>> bzr merge --pull
>> [hack away, test, hack some more, until ready to go public]
>> bzr diff > ../foo
>
> One possible variation at this point, important if I made local
> commits to the test branch while working on this particular feature:
>
> bzr diff -rsubmit: > ../foo
>
> The revision designated by `submit:' is the last common ancestor
> between the trunk and the test branch, i.e. the last point where I
> last re-synced with the trunk. This is exactly the changes I made
> that are not on the trunk.
If you use `bzr diff' and `patch' for incorporating your changes into
`trunk', bzr is unable to track. So you `bzr diff -rsubmit:' will
generate a diff as if you had never incorporated your local changes into
`trunk'.
- 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 <=
- 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
- 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