On Sun, 09 Jun 2013 00:25:42 +0300 Pekka Jääskeläinen <[email protected]> wrote:
> 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'. Ah. They just don't seem to be used externally. Not by users, not by launchpad, not by buildbot. > > 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? Yes. > What is a nuisance in a small project like pocl? I didn't get that > part. What changes when a project becomes "big"? The part of disallowing direct pushes to lp:pocl, and instead using launchpad merge requests exclusively is a bit overkill. Its a convenient way of enforcing a priori code reviews, though. > 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? Quite. And there seems to be at least three ways of doing it locally, so everyone can find their preferred way of working :) Again, accidental (and occasional) rewirtes are not a problem. But they do become a slight problem if they occur frequently. kalle ------------------------------------------------------------------------------ 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
