Will re-basing support be added into Bazaar core ?
russel.winder at concertant.com
Mon Apr 20 09:28:04 BST 2009
On Mon, 2009-04-20 at 02:53 -0500, David Timothy Strauss wrote:
> This is also unnecessary use of rebase. You can run "bzr diff
> --old=[mainline]" to get a patch that applies your feature branch's
> changes to the mainline. "bzr send" can produce something very similar
> with a merge directive that contains a human-readable patch.
Perhaps this is where things get interesting. I want to be able to push
to the mainline from the feature branch. If I have to prepare a patch
then hasn't failure of the DVCS to give me the tools I need occurred?
A patch is also a loss of information. How do those people who fret
about loss of information reconcile this one?
> Note: In either case, you'll first want to merge mainline -> feature
> branch in order to resolve any conflicts.
Dr Russel Winder Partner
Concertant LLP t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road, f: +44 8700 516 084 voip: sip:russel.winder at ekiga.net
London SW11 1EN, UK. m: +44 7770 465 077 xmpp: russel at russel.org.uk
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090420/8c46fadf/attachment.pgp
More information about the bazaar