Re: [RFC/PATCH 2/3] simplify-merges: never remove all TREESAME parents

2013-04-28 Thread Junio C Hamano
Kevin Bracey writes: >> Could you explain here a bit more the reason why we do not want to >> remove them and why "-s ours" is so significant that it deserves to >> be singled out? And why randomly picking one that is redundant >> (because it is an ancestor of some other parent) is an improvemen

Re: [RFC/PATCH 2/3] simplify-merges: never remove all TREESAME parents

2013-04-28 Thread Kevin Bracey
On 28/04/2013 02:02, Junio C Hamano wrote: Kevin Bracey writes: In the event of an odd merge, we may find ourselves TREESAME to apparently redundant parents. Prevent simplify_merges() from removing every TREESAME parent - in the event of such a merge it's useful to see where we came actually f

Re: [RFC/PATCH 2/3] simplify-merges: never remove all TREESAME parents

2013-04-27 Thread Junio C Hamano
Kevin Bracey writes: > In the event of an odd merge, we may find ourselves TREESAME to > apparently redundant parents. Prevent simplify_merges() from removing > every TREESAME parent - in the event of such a merge it's useful to see > where we came actually from came. > > Signed-off-by: Kevin Bra

[RFC/PATCH 2/3] simplify-merges: never remove all TREESAME parents

2013-04-26 Thread Kevin Bracey
In the event of an odd merge, we may find ourselves TREESAME to apparently redundant parents. Prevent simplify_merges() from removing every TREESAME parent - in the event of such a merge it's useful to see where we came actually from came. Signed-off-by: Kevin Bracey --- Documentation/rev-list-o