On Mar 4, 2009, at 6:42 AM, Ciaran Gultnieks wrote:
One suggestion - it seems that creating and deleting repos
is a relatively cheap operation in gitorious, so how about
creating individual cloned repositories for each specific
feature or bug fix, and requesting the merge from the
relevant repo. That would definitely keep things cleaner and
easier to keep track of.
Cheers,
Ciaran
Rather than whole repos, you can just use branches.
Create topic branches (aka feature branches) for each bug you want to
fix and see merged (I use the track ticket number, so ticket-5555 is
my bugfix branch for #5555 in Trac), and then request a merge from
that branch in your cloned repository to the appropriate branch in the
dev repository.
If it takes a long time for one of the core committers to get to your
bugfix but development of the dev branches keeps moving forward, you
should occasionally merge those changes into your bugfix branch. That
way when Evan or whoever looks at the merge request, the only ones "to
be merged" are the appropriate commits on your topic branch, bypassing
the need for the Control Yourself, Inc. team to be cherry picking in
the first place.
AFAIK, this is the *intended* workflow that Evan described earlier[0],
but of course I could also be projecting there, although this is what
I'm doing and it does seem to work very well, and is sans-cherry-
picking. :)
Cheers,
-Meitar Moscovitz
Personal: http://maymay.net
Professional: http://MeitarMoscovitz.com
EXTERNAL REFERENCES:
[0] http://mail.laconi.ca/pipermail/laconica-dev/2009-January/000871.html
_______________________________________________
Laconica-dev mailing list
[email protected]
http://mail.laconi.ca/mailman/listinfo/laconica-dev
