looms v. rebase (or, Where are the blogs?!) [was: Re: Will re-basing support be added into Bazaar core ?]
forest at alittletooquiet.net
Wed Apr 22 14:12:51 BST 2009
On Wed, Apr 22, 2009 at 06:26:53PM +0900, Stephen J. Turnbull wrote:
> Loom has its own flaws, however, as pointed out in
> However, it is disastrous to perform a partial commit in
> feature-foo and then going up-thread, as the remaining changes are
> suddenly combined with any pending merges resulting from moving
> up-thread. Thus, if a partial commit is performed, I first shelve
> any remaining changes before going up-thread[.]
> If I forget to shelve changes before moving up-thread with pending
> merges, the remaining uncommitted changes become intertwined with
> the pending merge, and can potentially be difficult to
> extricate. This can be a frustrating situation and is one of the
> primary warts of using loom as a quilt replacement.
I wrote that. This has since been fixed; up-thread will refuse to go anywhere
with live changes in the WT.
Another regular bzr-loom user, BTW. That makes at least 5.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090422/91a46a99/attachment-0001.pgp
More information about the bazaar