reverse merge....

[Aaron Bentley]

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

Erik Bågfors wrote:
> After having some discussions with people that wants to use bzr, it's
> clear that they want to
> 1) work in disconnected mode (and not use checkouts and "commit --local")
> 2) push changes to trunk when they feel like it
> 3) Not have more than one branch locally
> 4) Not disrupt history of trunk...

This sounds more like they do want to use checkouts, but don't like the
default of non-local commits.  If they alias commit to "commit --local",
then this works:

bzr branch sftp://...../trunk
cd trunk
hack hack; commit; commit
bzr update
bzr commit --no-local

Doesn't that seem more like what they want?
(And no, we don't specifically have to use the aliases mechanism to set
local as a default.)

> I was thinking about a reverse merge thing, basically, it would do
> what bzr update does in a heavy checkout.  It merges the local branch
> into the remote branch, but at the local location.  Would that be
> something that's doable?
> 
> bzr merge --reverse?

Certainly possible.  I wonder whether bzr merge; bzr pull --overwrite
could/should achieve this?

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

iD8DBQFFBWch0F+nu1YWqI0RAj+kAJ9S9sp48mHaO+rdhkh544holvK8hwCdHyz5
HUK9c2sXM7z3R2M0D62BIZ8=
=4C70
-----END PGP SIGNATURE-----