[MERGE] Branch format 6

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Erik Bågfors wrote:
>>
> First of all, Yes, I love this feature.  However, reading the bug
> doesn't make me 100% happy.  I think a command to "Merge this branch
> into the other branch but do it locally" is needed. I talked about
> "merge --reverse" before as an idea about this.

I think an operation like merge --reverse makes a lot of sense, but if I
choose to revert a merge like that, I want to end up at the state of my
last-committed revision, not the last_revision of the branch I merged.

But that is what would happen with the current state-of-the-art.

I've proposed fixing that.  See my "[RFC] Separating last-revision from
parents" thread.

> Basically, If I want to push to a branch that has this property, I have
> to run
> 
> bzr push --> Generates an error message telling me to bind
> bzr bind
> bzr update
> bzr commit
> bzr unbind
> 
> This is because I don't want to leave my branch bound.

I would think the way to do it is
- - keep a mirror of the mainline
- - When you want to merge into the mainline
  cd mainline
  bzr pull
  bzr merge ../mystuff
  bzr commit -m "Merged my stuff into mainline"
  bzr push

Or if the mirror was a bound branch:
  cd mainline
  bzr update
  bzr merge ../mystuff
  bzr commit -m "Merged my stuff into mainline"

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFF0Ief0F+nu1YWqI0RAla8AJ0drtFehjKDN8/Kgfct7ro69e1tygCdHSeP
PF44iz8s8LEzqyKwjGvcTaY=
=Pnzl
-----END PGP SIGNATURE-----