Contents of .bzr/merged-patches

[Martin Pool]

On Wed, 2005-04-20 at 15:38 -0400, Aaron Bentley wrote:

> I'd like to propose that, in addition to literally merged patches, the
> .bzr/merged-patches file should list all patches whose changes are
> reflected in the tree.

So you're saying it should be the transitive closure of merged patches,
not just the directly merged patches?  Yes, I think that makes sense.

At the moment I think we shouldn't store that list in every revision,
because it gets too big, but rather calculate and cache it in the
working revision.

> If this change were done, an un-merging (e.g. bzr merge . at 25 . at 24) would
> ~ remove the merged-patches entry for @25.  This is roughly the model of
> Arch tree logs.

I'm not sure yet that it's a good idea to allow revisions to be taken
back out once they're gone in.  The model of revisions is simpler (but
maybe less useful) if they monotonically increase.

> With Arch, though, merged-patches is conflated with revision-history, so
> baz replay --reverse $(baz tree-id) will change the output of baz
> tree-id.  Since revision-history is separate in bzr, this won't happen
> unless we deliberately change revision history, too.

-- 
Martin

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050421/d0b55c33/attachment.pgp