On Fri, Feb 12, 2016 at 11:06:04AM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > But I don't think this needs to have anything to do with merges in
> > particular, or rules like "when merging a branch that does not have me
> > in it". It is about saying "from here on out, the tree state
Jeff King writes:
> But I don't think this needs to have anything to do with merges in
> particular, or rules like "when merging a branch that does not have me
> in it". It is about saying "from here on out, the tree state should
> match this property, and we can test it by running this script".
On Fri, Feb 12, 2016 at 09:44:13AM -0800, Junio C Hamano wrote:
> Andrew Ardill writes:
>
> > What is the benefit in doing this in notes vs having the tests in the
> > working tree?
>
> Interesting. I have never thought of adding this information to the
> project history proper---I've viewed t
Andrew Ardill writes:
> What is the benefit in doing this in notes vs having the tests in the
> working tree?
Interesting. I have never thought of adding this information to the
project history proper---I've viewed this as primarily an aid for
keeping track of topics in-flight by an individual,
On Thu, Feb 11, 2016 at 2:42 PM, Andrew Ardill wrote:
> On 12 February 2016 at 09:06, Junio C Hamano wrote:
>>
>> To realize this, there are low-hanging-fruit building blocks that
>> are trivial:
>>
>> - Such an annotation can be made as a note attached to the commit
>>in question;
>>
>> -
On 12 February 2016 at 09:06, Junio C Hamano wrote:
>
> To realize this, there are low-hanging-fruit building blocks that
> are trivial:
>
> - Such an annotation can be made as a note attached to the commit
>in question;
>
> - Such a check can be done in pre-commit hook;
>
> - Such a pre-co
I wish there were a way to let me annotate a commit with a statement
like this:
* When merging a branch that does not have me in it into a trunk
that already has me, do this extra check on the result of the
merge before allowing it to be recorded.
For example, suppose there is a topic that
7 matches
Mail list logo