Pedro, Could you update it with "svn merge" example you mentioned before? That was why we start this.
"> > patch reviewed, tested and applied to AOO34 branch and > trunk > I guess there's going to be no no way to convince people to use SVN correctly (hint: "svn merge"). :( I will merge some minor fixes so that people can at least notice with good example. :-P." http://incubator.apache.org/openofficeorg/svn-basics.html Is good. We may add a branch section in it later. Herbert, Thank you for your update to the wiki. On Wed, Jun 6, 2012 at 11:07 PM, Pedro Giffuni <[email protected]> wrote: > Hi; > > I think I like current primer better. > > http://incubator.apache.org/openofficeorg/svn-basics.html > > Pedro. > > --- Mer 6/6/12, Yong Lin Ma <[email protected]> ha scritto: > >> Da: Yong Lin Ma <[email protected]> >> Oggetto: Re: Correct SVN practices (was Re: Fix for bug 119161) >> A: [email protected] >> Data: Mercoledì 6 giugno 2012, 07:56 >> http://wiki.services.openoffice.org/wiki/Svn_practices >> >> I would stop for awhile. Please help to update it, >> especially the >> branche section. Not all the things are accurate. >> >> >> On Wed, Jun 6, 2012 at 11:06 AM, bjcheny <[email protected]> >> wrote: >> > Hi Eric, >> > >> > I'd like to offer some tips on "svn changelist". >> > Let me know your comments. >> > Currently, I see no side-effect on using this feature >> during fixing bugs. >> > >> > 2012/6/5 Yong Lin Ma <[email protected]> >> > >> >> Pedro, >> >> I will do this. Please brief how do you hope the >> info will be >> >> organized and what should be highlighted. >> >> >> >> On Tue, Jun 5, 2012 at 12:16 AM, Pedro Giffuni >> <[email protected]> >> wrote: >> >> > >> >> > --- Lun 4/6/12, Jürgen Schmidt ha scritto: >> >> > >> >> >> > >> >> >> > I guess there's going to be no way to >> convince >> >> >> > people to use SVN correctly (hint: >> "svn merge"). :( >> >> >> >> >> >> I simply haven't thought about it but I >> agree svn merge >> >> >> would have been better here. Especially >> when we want to >> >> >> merge the whole branch later to trunk to >> ensure that >> >> >> we have all fixes integrated. >> >> >> >> >> > >> >> > svn merge actually helps a lot and I find it >> is really >> >> > powerful, especially when there are big >> changes involving >> >> > creating or moving files. I think part of the >> problem >> >> > is that we don't have the procedures >> documented yet >> >> > and people are afraid to break something in >> the main >> >> > tree. >> >> > >> >> > We do have a small primer but it can be >> improved. >> >> > For new (and sometimes old) committers it's >> good >> >> > to have some reference for doing their first >> commit, >> >> > the first merge, creating their own feature >> branch, >> >> > etc. >> >> > >> >> > Volunteers are welcome; I am a little busy but >> I >> >> > can give some pointers if someone wants to >> take >> >> > the task. >> >> > >> >> > Pedro. >> >> > >> >> >>
