On 06/08/2013 10:45 PM, Kalle Raiskila wrote: > SVN has its continuous revision numbers. Git has unique id:s for each > commit that don't change, even if they get merged. Bzr has neither. So
Bazaar has both. You can also get the globally unique ID using 'bzr testament'. > An other option is to have a separate work tree for pocl from which you > merge to a local "clean" pocl tree, and then push that clean tree to > lp:pocl. This is especially nice with bigger projects where you can > disallow direct pushes to the "master" repository - all commits come > via merges. Of course, this is a nuisance in small projects like pocl still > is :) Isn't merging *to* an upstream branch like you describe pretty much what git pull --rebase does? That's how I have always worked with Bazaar and "public branches" (in TCE and pocl). I apply merge requests to my local upstream branch bound checkout which I then commit in one revision. It works fine as long as everyone agrees to the centralized workflow in the upstream branches. What is a nuisance in a small project like pocl? I didn't get that part. What changes when a project becomes "big"? Maybe we should just agree now once and for all to work in the centralized "svn" mode also in pocl's public "upstream" branches (like we have done in TCE without problems) to have those nice short running revision numbers usable? -- --Pekka ------------------------------------------------------------------------------ How ServiceNow helps IT people transform IT departments: 1. A cloud service to automate IT design, transition and operations 2. Dashboards that offer high-level views of enterprise services 3. A single system of record for all IT processes http://p.sf.net/sfu/servicenow-d2d-j _______________________________________________ pocl-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/pocl-devel
