Thanks. On 8/24/2016 7:16 PM, Chris Pavlina wrote: > I'll fix it. > > On Wed, Aug 24, 2016 at 07:11:42PM -0400, Wayne Stambaugh wrote: >> Are saying that Niki's branch is different? When I was asking about a >> git version of the stable branch, why didn't you say something? I >> didn't even see that there was another branch in the mirror on github. >> I agree that it should match the mirror assuming the mirror is up to >> date with the bzr stable 4 branch. What do I need to fix this? If >> someone else wants to step up to the plate and fix this, I'm fine with >> that. I'm busy trying to get my own work done and my patience with the >> git transition is wearing thin. >> >> On 8/24/2016 4:35 PM, Nick Østergaard wrote: >>> I don't like that your "stable-4" branch don't match the 4.0 branch in >>> the kicad-source mirror. >>> See: >>> https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev/commit/?h=stable-4&id=7ced0635031e2dcf7ec34db598726f0887da2cc5 >>> https://github.com/KiCad/kicad-source-mirror/commit/bcdcaa724d1097bffd3654220ed549363fac8059 >>> >>> I think it would be better off if we could use the 4.0 branch from the >>> kicad-source-mirror to base it on, and name the branch 4.0 as it was >>> named before and everywhere else. >>> >>> Why did you suddenly start to name the banch "stable-<major_number>" >>> >>> 2016-08-23 19:39 GMT+02:00 Wayne Stambaugh <stambau...@gmail.com>: >>>> Thanks everyone for taking a look at this. I just pushed the stable-4 >>>> branch to lp:kicad so we should be synced up. I'll tag the bzr stable 4 >>>> repo as obsolete when I get a chance. >>>> >>>> On 8/23/2016 1:13 PM, kinichiro inoguchi wrote: >>>>>> Can someone please take a look at it you get a chance and make sure I >>>>>> didn't make a mess of things before I push this to the main repo. >>>>> >>>>> Hi, >>>>> >>>>> I compared the new git stable-4 repository and old bzr lp:kicad/4.0. >>>>> https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev >>>>> https://code.launchpad.net/~stambaughw/kicad/4.0 >>>>> >>>>> 1. empty directory packaging/linux/ is missing >>>>> >>>>> I checked contents by $ diff -rq lp_kicad_4/ git_stable4/ . >>>>> Is this directory needed ? >>>>> >>>>> 2. difference of commit logs >>>>> >>>>> On lp_kicad_4, lines of logs are 6308. >>>>> $ bzr log --line | wc -l >>>>> 6308 >>>>> >>>>> On git_stable4, 8181 logs exists. >>>>> $ git log --oneline | wc -l >>>>> 8181 >>>>> >>>>> To see diffs, I created the log texts by these commands. >>>>> >>>>> On lp_kicad_4, >>>>> $ bzr log --line | sed 's/^[0-9]*: .* >>>>> [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] //' \ >>>>> | sed 's/^{.*} //' > ../bzr.txt >>>>> >>>>> On git_stable4, >>>>> $ git log --oneline | sed 's/^[a-zA-Z0-9]* //' > ../git.txt >>>>> >>>>> Then look at the diffs, >>>>> $ diff -y bzr.txt git.txt | less >>>>> >>>>> For example, diffs are like this. >>>>> >>>>> ============================================================================ >>>>> ... >>>>> Pcbnew: fix potential issue (crash) when loading board files Pcbnew: >>>>> fix >>>>> [merge] OSX: back port touchpad support from development bran | OSX: >>>>> back po >>>>> > Fix >>>>> 3d-viewe >>>>> > Fix >>>>> touchpad >>>>> > Add >>>>> support >>>>> OSX: legacy canvas rendering speed improvements. OSX: >>>>> legacy >>>>> ... >>>>> >>>>> ============================================================================ >>>>> >>>>> This diff referes to revno 6291. >>>>> It seems that git displays all the commit logs in 1 merge of bzr. >>>>> http://bazaar.launchpad.net/~stambaughw/kicad/4.0/revision/6291 >>>>> >>>>> I think these diffs of commit logs are not problem. >>>>> >>>>> >>>>> After all, I think new git stable4 branch is right. >>>>> And, thanks for all of your hard works. >>>>> >>>>> _______________________________________________ >>>>> Mailing list: https://launchpad.net/~kicad-developers >>>>> Post to : kicad-developers@lists.launchpad.net >>>>> Unsubscribe : https://launchpad.net/~kicad-developers >>>>> More help : https://help.launchpad.net/ListHelp >>>>> >>>> >>>> _______________________________________________ >>>> Mailing list: https://launchpad.net/~kicad-developers >>>> Post to : kicad-developers@lists.launchpad.net >>>> Unsubscribe : https://launchpad.net/~kicad-developers >>>> More help : https://help.launchpad.net/ListHelp >> >> >> _______________________________________________ >> Mailing list: https://launchpad.net/~kicad-developers >> Post to : kicad-developers@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~kicad-developers >> More help : https://help.launchpad.net/ListHelp
_______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp