Bazaar-NG documentation

[Robert Collins]

On Wed, 2005-08-31 at 10:21 +0200, martin f krafft wrote:
> also sprach James Blackwell <jblack at merconline.com> [2005.08.31.0951 +0200]:
> > Oh, and before I forget, its at
> > http://bazaar.canonical.com/BzrDocumentation
> 
> Thanks!
> 
> One thing I am missing on there is: given a branch and a set of
> local changes, how do I feed it back to the main branch? What if
> I branched over HTTP?

Heres *an* answer for whomever wishes to upload it....

If you made a branch B from a location A that you have write access too:
  if no commits have been done to A, then you can use 'bzr push'. push
is provided by aaron bentleys bzrtools at the moment, it will become a
builtin to bzr in due course.
  If commits have been done to A (either by someone else pushing, or
someone committing directly), then you need to either:
    - cd to A, merge from your branch B, and bzr commit or
    - make a new branch C from A, merge in your branch B, commit, and
then bzr push.
   the latter will work with http branches, the former (cd to A..)
won't ;0. We will have a simpler method to resolve history difference
and let you push up with out making a temporary branch, but it doesn't
exist yet.

If you made a branch B from a location A that you do NOT have write
access to:
  1) put your branch somewhere that someone with write access to can
access. 
  2) Ask nicely.

Rob



-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050901/71d4e0c1/attachment.pgp