#6007 NORM Never A: Threaded view in journal

[Zarro Boogs per Child]

#6007: Threaded view in journal
------------------------------+---------------------------------------------
 Reporter:  homunq            |       Owner:  tomeu                            
     Type:  enhancement       |      Status:  new                              
 Priority:  normal            |   Milestone:  Never Assigned                   
Component:  journal-activity  |     Version:  Development build as of this date
 Keywords:                    |    Verified:  0                                
 Blocking:                    |   Blockedby:                                   
------------------------------+---------------------------------------------
 Unless you use filters, there is no association between the different
 versions of a file in the journal. I suggest that the main journal view be
 more like a treeview, with different versions of a given file bunched
 under the latest edit of that file. Branches should appear separately,
 each one under the latest edit. The common history should appear in the
 expanded history for both branches. Changing file names should
 artificially cause a branch.

 For extra credit, a different-looking line in the expanded view of a file
 will show alternate branches. Even more extra credit, there could be a way
 to do a 3-way merge with alternate branches. And ultimate extra credit,
 keep track of 3-way merges and do a weave merge when you complete a
 triangle of merges between 3 branches. These last two levels would
 probably be best accomplished with Bazaar.

 This feature (including extra credit) is a prerequisite for improved
 offline sharing, but that will go in another ticket.

-- 
Ticket URL: <http://dev.laptop.org/ticket/6007>
One Laptop Per Child <http://dev.laptop.org>
OLPC bug tracking system