Le 14 janv. 2013 à 17:26, KP Kirchdoerfer <kap...@users.sourceforge.net> a écrit :
> Hi Yves; > > can you pls merge maint to master so we do have the openvpn update in > master? > Yes done. > I followed the path you described earlier, but I'm not happy with it in > that case. > > The preferred way IMHO would have been to update openvpn in master and > see if users of the alpha version report errors and to backport it later > to 4.x. > > Anything wrong with that approach? > Yes you can't because master is a superset branch of maint. So you should never merge downwards. This is what i have done exactly: ~/buc5 (master % u=) $ git fetch --all ~/buc5 (master % u=) $ git checkout master ~/buc5 (master % u=) $ git pull --rebase To see what is in maint that are not in master ~/buc5 (master % u=) $ git cherry -v master origin/maint Try to merge: ~/buc5 (master % u=) $ git merge --no-commit maint Removing repo/openvpn/openvpn-2.2.2.tar.gz Auto-merging repo/openvpn/buildtool.mk CONFLICT (content): Merge conflict in repo/openvpn/buildtool.mk Auto-merging repo/openvpn/buildtool.cfg CONFLICT (content): Merge conflict in repo/openvpn/buildtool.cfg Auto-merging conf/sources.cfg CONFLICT (content): Merge conflict in conf/sources.cfg Recorded preimage for 'conf/sources.cfg' Recorded preimage for 'repo/openvpn/buildtool.cfg' Recorded preimage for 'repo/openvpn/buildtool.mk' Automatic merge failed; fix conflicts and then commit the result. To see where conflicts are: ~/buc5 (master % u=) $ git status # Unmerged paths: # (use "git add <file>..." to mark resolution) # # both modified: conf/sources.cfg # both modified: repo/openvpn/buildtool.cfg # both modified: repo/openvpn/buildtool.mk now edit the repo/openvpn/buildtool.* files to resolve conflicts (removing easyrsa) now that the sources.cfg has been split into multiple files in buc5 we need to restore the buc5 conf/sources.cfg: Restore OUR version (buck) of conf/sources.cfg: ~/buc5 (master % u=) $ git checkout --our conf/sources.cfg And we need to create a dedicated source file. To see what have done in conf/sources.cfg in maint do: ~/buc5 (master % u=) $ git show --pretty=short origin/maint -- conf/sources.cfg +<Package easyrsa> + Server = localrepo + Revision = HEAD + Directory = easyrsa + Description = Simple shell based CA utility + <Requires> + Name = buildenv + Name = openssl + </Requires> +</Package> + So now create a conf/source.d/easyrsa.cfg with this informations: ~/buc5 (master % u=) $ git show --pretty=oneline origin/maint -- conf/sources.cfg >conf/sources.d/easyrsa.cfg then edit the file to remove garbage (also replace buildenv to toolchain :) ) Now add the new file to git: ~/buc5 (master % u=) $ git add conf/sources.d/easyrsa.cfg Now that you are ready to commit the merge. Add the modified files to the staging area: ~/buc5 (master % u=) $ git add -u You can review the complete merge with the command: ~/buc5 (master % u=) $ git diff --cached Before commit the merge it's better to try to build the packages: ~/buc5 (master % u=) $ ./buildtool.pl build openvpn ~/buc5 (master % u=) $ ./buildtool.pl build easyrsa ~/buc5 (master % u=) $ sudo ./buildpacket.pl --package=openvpn ~/buc5 (master % u=) $ sudo ./buildpacket.pl --package=easyrsa All is ok so create the commit: ~/buc5 (master % u=) $ git commit -av Change the commit message to: Sync with branch 'maint' * Update openvpn to 2.3.0 * New package easy-rsa 2.2.0 Now push to public repository ~/buc5 (master % u=) $ git push Et VOILA ! Regards, Yves ------------------------------------------------------------------------------ Master SQL Server Development, Administration, T-SQL, SSAS, SSIS, SSRS and more. Get SQL Server skills now (including 2012) with LearnDevNow - 200+ hours of step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only - learn more at: http://p.sf.net/sfu/learnmore_122512 _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
