Actually this kind of measures show the weakness of svn merging. It's pretty hard to track merges in svn.
I saw a migration to git on your roadmap as well. I would suggest you re- evaluate this merge restriction at that time. Git merges are more powerful and easier to track. In general, though I don't think merging outside of the revision control system is a good idea. Not that my vote should matter much, I'm just passively following the CS project out of interest. Geert On vrijdag 25 november 2011, Jorrit Tyberghein wrote: > Mike, this isn't about getting rid of branches. This is about how branches > should be merged > according to Phil. Instead of letting svn take care of the merging > (svnmerge script) he proposes > to merge manually (using a diff) so that you get a proper diff in trunk. > > I don't know if this is a good idea or not. Just clarifying what Phil > really means. > > Greetings, > > On Fri, Nov 25, 2011 at 3:43 PM, Mike Gist <[email protected]> wrote: > > On 25 November 2011 14:11, Philip Wyett <[email protected]> wrote: > >> Merges into trunk cause much hassle and tracking. Many want to see > > > > changes into trunk as a diff not a merge and not go here and there to > > > >> find the diff. Trunk should be pure code. If a dev cannot diff there own > >> tree and commit with an explanation, they should not be a dev. > > > > I don't want to read through a 10k line diff. I want to see commits on > > new features as they happen. > > I also don't want trunk broken. Branches work great for me, plus all our > > GSoC students work in a branch. > > There's no way I'm going to have them sending me diffs every day which I > > then have to patch on my local copy. It's a waste of time. > > > > -- > > - Mike > > > > > > ------------------------------------------------------------------------- > > ----- All the data continuously generated in your IT infrastructure > > contains a definitive record of customers, application performance, > > security threats, fraudulent activity, and more. Splunk takes this > > data and makes sense of it. IT sense. And common sense. > > http://p.sf.net/sfu/splunk-novd2d > > _______________________________________________ > > Crystal-develop mailing list > > [email protected] > > https://lists.sourceforge.net/lists/listinfo/crystal-develop ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-novd2d _______________________________________________ Crystal-main mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/crystal-main Unsubscribe: mailto:[email protected]?subject=unsubscribe
