I'd like to help with Instiki...

Daryl Richter wrote:
> One question on your instructions below, though:
>
> John Whitley wrote:
>>
>> Then to make a new local branch for bugfix work,
you can type the  
>> following in the repo directory:
>>
>> bzr branch trunk bugNNN
>
> should this be "bzr branch main bug270"?
>
> I guess perhaps that's the same thing.

Well, main is defined as trunk + all other changes to date. 
I.e.  
trunk is the SVN mirror, while main contains all of the
changes that  
aren't in SVN.  For now, work on a branch of trunk and then
I'll  
merge it into main.  This pattern will only hold water for
so long,  
eventually bugfix and/or feature work will start to have an 

increasing number of conflicts.  But working off of trunk
has the  
short-term advantage of making things easier to move into
SVN for the  
moment.

-- John


_______________________________________________
Instiki-users mailing list
Instiki-usersrubyforge.org
h
ttp://rubyforge.org/mailman/listinfo/instiki-users