Re: [PATCH v2 03/13] add the basic data structure for line level history
From: Bo Yang <hidden>
Date: 2016-06-15 22:49:05
On Tue, Jul 6, 2010 at 10:36 AM, Junio C Hamano [off-list ref] wrote:
This patch does not apply. What did you base this version on top of?
Hmm, I have just fetch the newest version of current git and make a rebase, and I found that there is no conflict of any patch. Could you please take a look that whether you are applying the the newest patch of this thread. Its subject is: [PATCH v2 03/13] add the basic data structure for line level. And my log to see: d0e8b59b04c19419458fd61a9342efba8f849a82 some document update 70188b228b459fc92b740aadbd5dac72c010cb01 add two test cases bcb75c23a5d46dad69439d60002624f6071ba3dc add --always-print option 99c4697dcc5414ee3b864a7cc2c07cb25be229d9 map/print ranges along traversing the history topologically 6ccac2635a4e62c2b8129d9e2306f7e8177d9a16 print the line log c9b90713a844939c2dd3695b5006f83818c6309f map/take range to parent cdd2b5bfcf0be9021d50b0657d2692cb2538ae0c add range clone functions 0e3bd1b8c52c5d9ed1d597e9248331ac6b484fea export three functions from diff.c b06f615af36a6c9e4a06406124d3fae8b2cd9a54 parse the -L options 3a3f8ae45ebe56e3be9b2fb1c0e238dd9c284b02 refactor parse_loc 067314e4ad65d8595ad35a6a4e954e0a3da514f1 add the basic data structure for line level history c967805c73daf3fb88d242a5b82768f16a1f904e parse-options: add two helper functions e6247e51dc11cc8a133403c55d9dfe8e3ede8723 parse-options: stop when encounter a non-option 22cff1daaaf3db08b6fed9c7f4c1a289f1dd5d83 Change to debug mode. 5b5275f6e9ca6284ca123f729d5a78f409e448fb Merge branch 'maint' The master is at 5b5275f6e9ca6284ca123f729d5a78f409e448fb. :-) -- Regards! Bo ---------------------------- My blog: http://blog.morebits.org Why Git: http://www.whygitisbetterthanx.com/