debian package and 0.39_beta thoughts
PICCA Frédéric-Emmanuel
frederic-emmanuel.picca at synchrotron-soleil.fr
Sat Dec 5 23:06:25 UTC 2009
> I think this is part of the refactoring of the git repository that has
> yet to happen.
> See the topic: New Git Repositories Organization
> http://lists.alioth.debian.org/pipermail/lisaac-devel/2009-November/000579.html
> When the stable branch was created, it was to have a stable version in
> which all commits would be working. Benoit could continue working on his
> master branch and break things from time to time.
> So I used this branch (and I think others did as well) to add minor
> changes that wouldn't break the compiler but only improve it.
> Unfortunately the stable branch was never merged in master.
> When the master branch started to become stable, I decided to just merge
> it in the stable branch. The result had fewer bugs (Ben fixed some bugs
> in master), it couldn't do any harm. And we needed a merge. The problem
> is that the longer we wait to merge, the more difficult it becomes.
ok so now it is time to merge back stable into master.
> Now, I think that with the new repository organization, the branch
> stable and master are to become one, and it would be called master. Any
> other branch should be named <author>-<feature>
lets look at the git branch organisation
git lisaac
master stable
next master
pu/<feature> <author>-<feature>
it is a lot similar. so there is room for the stable and master branch :)
read this file is explain correctly the git workflow
http://git.kernel.org/?p=git/git.git;a=blob;f=Documentation/gitworkflows.txt;h=065441df644b6efc2883bec87fee4941788312ef;hb=1a56be134f9477296a7ade040e8b802bf3a643a1
> But this is slow, like everything else.
patience :)
Fred
See you
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/ms-tnef
Size: 3938 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/lisaac-devel/attachments/20091206/bb57db3d/attachment.bin>
More information about the Lisaac-devel
mailing list