reverse merge....

[Erik Bågfors]

Hi

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...

so, basically, the following works... almost

bzr branch sftp://...../trunk
cd trunk
hack hack; commit; commit
bzr push # opps, changes has happened in trunk, I have to merge it
bzr merge; test; bzr commit
bzr push


However, this disrupts the history of trunk, since push changes
trunk's history into my own branchs history.

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?

/Erik
-- 
google talk/jabber. zindar at gmail.com
SIP-phones: sip:erik_bagfors at gizmoproject.com
sip:17476714687 at proxy01.sipphone.com