Re: bzr send

[Henrik Nordstrom]

ons 2008-04-02 klockan 14:59 -0600 skrev Alex Rousskov:
> Do I still start the subject with [MERGE] to enable bb voting/approval
> process?

If I understand the code correctly it picks up all messages having with
a subject of [MERGE* or [PATCH* as merge requests, even if there is no
patch.. and additionally picks up "response submissions" (Re: [MERGE|
PATCH*) if there is a patch attached.

Regards
Henrik

Re: bzr send

[Robert Collins]

On Wed, 2008-04-02 at 14:56 -0600, Alex Rousskov wrote:
> On Wed, 2008-04-02 at 21:16 +0200, Henrik Nordstrom wrote:
> > ons 2008-04-02 klockan 10:51 -0600 skrev Alex Rousskov:
> 
> > > I doubt bzr managed to generate a proper bundle, even though I did
> > > follow instructions and did _not_ commit before running the two commands
> > > below.
> > 
> > You need to commit on a branch before send.
> > 
> > send is for submitting the contents of a branch for merge.
> 
> Can I submit a stand-alone patch/diff instead? 

Yes.

> Should this be done
> manually by starting the mail subject with [MERGE]? I do not want to
> create a branch for every small change I want to commit (or maintain a
> catch-all theme-less branch)...

Yes.

-Rob
-- 
GPG key available at: .


signature.asc
Description: This is a digitally signed message part

Re: bzr send

[Alex Rousskov]

On Wed, 2008-04-02 at 22:46 +0200, Henrik Nordstrom wrote:
> ons 2008-04-02 klockan 21:16 +0200 skrev Henrik Nordstrom:
> > ons 2008-04-02 klockan 10:51 -0600 skrev Alex Rousskov:
> > 
> > > 
> > > I doubt bzr managed to generate a proper bundle, even though I did
> > > follow instructions and did _not_ commit before running the two commands
> > > below.
> > 
> > You need to commit on a branch before send.
> > 
> > send is for submitting the contents of a branch for merge.
> 
> Forgot to say.. if you want to sumbit uncommitted changes and do not
> want to bother with setting up a branch for it then just send a "bzr
> diff". It's generally sufficient, and if you haven't committed the
> change to your sources then there is no revision to track for merges..

Do I still start the subject with [MERGE] to enable bb voting/approval
process?

Alex.

Re: bzr send

[Alex Rousskov]

On Wed, 2008-04-02 at 21:16 +0200, Henrik Nordstrom wrote:
> ons 2008-04-02 klockan 10:51 -0600 skrev Alex Rousskov:

> > I doubt bzr managed to generate a proper bundle, even though I did
> > follow instructions and did _not_ commit before running the two commands
> > below.
> 
> You need to commit on a branch before send.
> 
> send is for submitting the contents of a branch for merge.

Can I submit a stand-alone patch/diff instead? Should this be done
manually by starting the mail subject with [MERGE]? I do not want to
create a branch for every small change I want to commit (or maintain a
catch-all theme-less branch)...

Thank you,

Alex.

Re: bzr send

[Henrik Nordstrom]

ons 2008-04-02 klockan 21:16 +0200 skrev Henrik Nordstrom:
> ons 2008-04-02 klockan 10:51 -0600 skrev Alex Rousskov:
> 
> > 
> > I doubt bzr managed to generate a proper bundle, even though I did
> > follow instructions and did _not_ commit before running the two commands
> > below.
> 
> You need to commit on a branch before send.
> 
> send is for submitting the contents of a branch for merge.

Forgot to say.. if you want to sumbit uncommitted changes and do not
want to bother with setting up a branch for it then just send a "bzr
diff". It's generally sufficient, and if you haven't committed the
change to your sources then there is no revision to track for merges..

You can also use "bsr commit --local" to commit the change only to your
local repository shadow without immediately pushing it upstream using
send or other methods, but keep in mind that it will make your trunk
derive from the main trunk until resolved, and gets somewhat messy if
you then want to commit another change to the upstream before this...
(but still doable)

Regards
Henrik

Re: bzr send

[Henrik Nordstrom]

ons 2008-04-02 klockan 10:51 -0600 skrev Alex Rousskov:

> 
> I doubt bzr managed to generate a proper bundle, even though I did
> follow instructions and did _not_ commit before running the two commands
> below.

You need to commit on a branch before send.

send is for submitting the contents of a branch for merge.

Regards
Henrik