Sorry, I'm still a little confused on the branches. I'm working successfully on the 1.2 branch, but I have a few more questions: - What is the CVS command to list available branches? I couldn't find that in the docs. - Where is MARC development being done? In the main branch, or a forked 1.4 branch? If it is in a forked branch, what is the main branch for? - How will the 1.2 branch be rolled in or reconciled with the main branch? Should I be putting important changes into more than one branch? Thanks - Alan ---- Alan Millar --==> am12@bolis.com <==--
On Fri, 14 Jun 2002, Alan Millar wrote:
Sorry, I'm still a little confused on the branches.
I'm working successfully on the 1.2 branch, but I have a few more questions:
- What is the CVS command to list available branches? I couldn't find that in the docs.
dunno, I'll look it up later (you may need to remind me). we have only a rel-1-2 and the main branches active.
- Where is MARC development being done? In the main branch, or a forked 1.4 branch? If it is in a forked branch, what is the main branch for?
In the main branch (until we cut a rel-1-3 tree -- not for a while yet)
- How will the 1.2 branch be rolled in or reconciled with the main branch? Should I be putting important changes into more than one branch?
I'd say do you work in 1.2 and as you get features done (and tested), let Paul know and he can make the decision about how/when/if to merge that feture into the main branch. He's the owner of the 1.4 release. thanks, -pate
Thanks
- Alan
---- Alan Millar --==> am12@bolis.com <==--
_______________________________________________________________
Don't miss the 2002 Sprint PCS Application Developer's Conference August 25-28 in Las Vegas - http://devcon.sprintpcs.com/adp/index.cfm?source=osdntextlink
_______________________________________________ Koha-devel mailing list Koha-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/koha-devel
Alan Millar wrote:
Sorry, I'm still a little confused on the branches.
Happy to see i'm not alone ;-)))
I'm working successfully on the 1.2 branch, but I have a few more questions: - What is the CVS command to list available branches? I couldn't find that in the docs.
i don't know, i look through sourceforge ;-) Anyway, we have only 2 used branches : rel-1-2 and the main one
- Where is MARC development being done? In the main branch, or a forked 1.4 branch? If it is in a forked branch, what is the main branch for?
it's done in the main branch. the "rel-1-4-marc branch isn't used
- How will the 1.2 branch be rolled in or reconciled with the main branch? Should I be putting important changes into more than one branch?
For instance, nothing is done in the MARC stuff that should be hard to merge with the 1.2 branch. I hope the 1.2 branch will be very stable soon... -- Paul koha 1.4 release manager
participants (3)
-
Alan Millar -
Pat Eyler -
paul POULAIN