[dist-bugs] salutations

[Aidan Van Dyk]

* Joey Hess <joey at kitenet.net> [080708 20:50]:
> Bart Trojanowski wrote:
> > Sorry Joey, it's been too long since I read abut all these to remember
> > the internal details.
> > 
> > * Joey Hess <joey at kitenet.net> [080708 19:19]:
> > > For example, I assume most of them deal with merging diverged bug states[1]
> > > -- do they use close to the same techniques, or wildly different? Any
> > > especially good techniques? 
> > 
> > Merging the bug description will likely result in required user
> > intervention.  But changes to the description are more rare than
> > comments.  In git-case we decided to avoid merging issues by making
> > comment immutable, and form a message tree inspired by email.  In email
> > the relationship between comments is defined by references up to the
> > parent commit.  This allows us to build threaded comments, and even
> > import bug discussions back from a mailing list into the tracker.
> 
> Yeah, I reached the same conclusion about comments, and also use
> email-like references. In my design I split data into two sets, one
> contains state about the bug (open, closed, blocked, which versions
> affected, etc), and the other contains stuff like comments and patches.
> Only merging the state is tricky.
 
And single value things (like job state) will *need* to be resolved if
conflicting changes are made.  If I change a "new" case state to
"invalid/wontfix" and you mark it as "valid", that change needs to be
resolved by someone who can evaluate both changes...

In git-case, we purposely tried to make sure that a case tree was set
such that things that could be changed to cause conflicts were things
which definitely would need a "decision" to resolve them.  From memory,
those few things were:
	assigned
	state
	type
	description (more of a title/name than content)

Everything else should hopefully "just merge"...

a.

-- 
Aidan Van Dyk                                             Create like a god,
aidan at highrise.ca                                       command like a king,
http://www.highrise.ca/                                   work like a slave.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://kitenet.net/pipermail/dist-bugs/attachments/20080709/86015dce/attachment.pgp>