tags

Jan Hudec bulb at ucw.cz
Mon Feb 20 09:06:32 GMT 2006


On Mon, Feb 20, 2006 at 14:56:54 +1100, Martin Pool wrote:
> Aaron wrote:
> 
> > Jan Hudec wrote:
> > | On Sat, Feb 11, 2006 at 14:22:55 -0500, Aaron Bentley wrote:
> > |>I am starting to think that an explicitly versioned scalar file format
> > |>would be useful.
> > |>
> > |>e.g. each value in an inventory entry would be versioned separately,
> > |>making scalar weave merging of inventory entries exceedingly simple.
> 
> I think whether rio-format splits things across lines is a bit beside
> the point: the best way to do scalar merge of these things is likely to
> record each scalar as a stanza, e.g. 
> 
>   tag-name: bzr-0.8-foo
>   tag-target: mbp at fodiodisf-1230192301923
>   placed-in: mbp at fodiodisf-1230192301923
> 
> And you could then use the placed-in field to do resolution of merges,
> rather than the weave annotations.

It would be easier to stuff the properties into inventory then. The
whole point of using weaves for merging is to make things simpler --
this would not make anything so.

-- 
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060220/6195e9ff/attachment.pgp 


More information about the bazaar mailing list