kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #25884
Re: Git transition
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@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help : https://help.launchpad.net/ListHelp
>
Follow ups
References
-
Re: Git transition
From: Clemens Koller, 2016-08-22
-
Re: Git transition
From: Wayne Stambaugh, 2016-08-22
-
Re: Git transition
From: Chris Pavlina, 2016-08-22
-
Re: Git transition
From: Wayne Stambaugh, 2016-08-22
-
Re: Git transition
From: Shane Burrell, 2016-08-22
-
Re: Git transition
From: Chris Pavlina, 2016-08-22
-
Re: Git transition
From: Nick Østergaard, 2016-08-22
-
Re: Git transition
From: Niki Guldbrand, 2016-08-22
-
Re: Git transition
From: Wayne Stambaugh, 2016-08-22
-
Re: Git transition
From: Niki Guldbrand, 2016-08-22
-
Re: Git transition
From: Chris Pavlina, 2016-08-23
-
Re: Git transition
From: Wayne Stambaugh, 2016-08-23
-
Re: Git transition
From: Niki Guldbrand, 2016-08-23
-
Re: Git transition
From: Wayne Stambaugh, 2016-08-23
-
Re: Git transition
From: Niki Guldbrand, 2016-08-23
-
Re: Git transition
From: Wayne Stambaugh, 2016-08-23
-
Re: Git transition
From: kinichiro inoguchi, 2016-08-23