[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 16:19:23 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.93 (gnu/linux) |
Eli Zaretskii <address@hidden> writes:
>> And there is yet another solution, which is to bind the quickfixes
>> branch to upstream. Instead of `bzr merge', do `bzr update'. When you
>> finish a change, `bzr commit' will send it automatically upstream.
>
> But then why have a separate branch for that? This is precisely the
> workflow in `trunk'. What am I missing?
Although you can use `trunk' for that, I prefer to avoid overloading too
much the purpose of things. `trunk' is your pristine upstream's mirror
and the gateway for merging local changes into upstream. There are cases
where using `trunk' for hacking can create inconveniences (not very
serious incoveniences, though).
For instance, if you begin hacking into something that seems easy but
later discover that it is a deeper issue, turning `quickfixes' into a
feature branch is trivial. If you were working on `trunk' you'll need to
create a feature branch and merge `trunk's uncommitted changes into it,
which may be tricky on some cases, as if you have new unregistered
files.
Another scenario that can be a bit tricky to handle if you use `trunk'
for hacking is when you go off-line for a while and end accumulating a
series of local commits of quickfixes on `trunk'
Re: Installing changes from branches, Juanma Barranquero, 2010/04/02
Re: Installing changes from branches, Jan Djärv, 2010/04/03