On Thu, May 11, 2006 at 11:15:12AM -0400, Bill Sommerfeld wrote: > This situation is analogous to the "merge with common ancestor" > operations performed on source code by most SCM systems; with a named > snapshot as the clone base, the ancestor is preserved and can easily be > retrieved.
Yes, and in general it's hard to automate. For specific files one may know what to do and how to automate the process (think acr). > there's a real opportunity here to enhance packaging class action > scripts to allow for a file-format-specific three-way merge when > conflicting changes are detected on both "branches". > > for editable files, packaging squirrels away an unmodified copy so there > are actually four or five different versions which might conceivably > provide input to different stages of an upgrade. This would be wonderful. Maybe we could enhance packaging's notion of class action scripts. _______________________________________________ zfs-discuss mailing list zfs-discuss@opensolaris.org http://mail.opensolaris.org/mailman/listinfo/zfs-discuss
