dvcs - Step-by-step bazaar workflow -


where work, work (mostly) in pairs. have seen need version control, , using bazaar our distributed version control system, due apparent flexibility.

after experimentation, have agreed in order set project, should use following steps:

on server

  1. bzr init (initializes project)
  2. bzr add (tells bzr track files in current directory, please make sure not have unnecessary files in project skeleton before run command)
  3. bzr commit -m "initial commit" (commits added files bzr version control)

on development machine

  1. on local machine, bzr branch project_dir

daily routine

we trying establish workflow work us. have agreed daily:

  1. pull down latest changes pull_path
  2. code , commit. nb. commits saved on local machine.
  3. see step 1.
  4. push changes push_path (nb. push_path = pull_path)
  5. if there conflict:
    • try bzr resolve first.
    • if fails, partner , manual resolve (open file.other, file.base , file.this , make relevant changes).
    • commit changes (bzr commit)
    • push again (bzr push)
    • repeat above sub-points (#5) until conflicts resolved.

in terms of workflow, right way version control bazaar? have encountered problems our commit comments 'change ownership' everytime other team member pushes changes server. i'm pretty sure not how it's supposed work, may due options selected during project setup phase.

as vcs evangelist here, working on guide used team, , particularly new people team grows, , great have 'proper' set of steps follow in getting work done. contributions in establishing nice , simple step-by-step flow best out of bzr appreciated. please add contributions here.

thank in advance :)

what operating system(s) run on server , development machines? , file systems? windows file systems' permissions , owner / group differ same files on unix file system. might first stumbling block.

bazaar workflow:

run main tree on repo server, , checkout locally:

bzr checkout sftp://path/to/repo/project /var/source/project

branch checkout locally / dev environment:

bzr branch sftp://path/to/repo /var/www/project

don't work on checkout, work on dev branch. work , commit there, using various bzr commands.

once work module / bug fix / task finished, merge (not push) main repo:

//in /var/source/project bzr merge /var/www/project //resolve conflicts bzr resolve //commit merge bzr commit -m "work module | task | bug fixed"

because /var/source/project checkout, repo on repo server updated automatically. enables 2 or more developers work on same project concurrently, without needing push , pull whole time.


Comments

Post a Comment

Popular posts from this blog

apache - Add omitted ? to URLs -

i working on website cms reads page name of query string, e.g. http://exmaple.com/?pagename . trying create rewrite rule rewrite ? . so, user types in /pagename , taken /?pagename try this: rewriteengine on rewritecond %{request_filename} !-d rewritecond %{request_filename} !-f rewriterule ^/?(.*) index.php?$1 [l]
Read more

redirect - bbPress Forum - rewrite to wwww.mysite prohibits login -

i using bbpress installation without wordpress integration. the redirect of rewriteengine @ forum site works: rewriteengine on rewritecond %{http_host} ^forum.mysite.com$ rewriterule (.*)$ http://www.forum.mysite.com/$1 [r=301,l] the problem login pppress. bbpress login not recognize: http://www.forum.mysite/bb-login.php . it redirects to: http://forum.mysite.com/bb-login.php . i tried permalink settings none , name based, same issue. does uses redirect in bbpress or how can eliminate "double" content , redirect permanently www.? i redirected www.forum.mysite.com forum.mysite.com , achieved eliminate "double" content.
Read more

php - How can I stop spam on my custom forum/blog? -

so have custom built forum & blog system of late has been dealing lot of spam. if wordpress use akismet, if different common platform i'm sure i'd find plugin. there kind of static class can download this? using php. i'd still go akismet, if it. uses outside of wordpress, may have pay fee it, depending on use -- check terms , conditions -- it's option , easy implement in php using api. use api key wordpress. com account access. basically, grab whichever php client library takes fancy -- use alex potsides' php5 library -- plug in key, , it's handful of lines of code. here's bare bones of validation straight 1 of live sites: ... if ($akismet) { $akismet->setcommentauthor($name); $akismet->setcommentauthoremail($session->userinfo["email"]); $akismet->setcommentauthorurl(""); $akismet->setcommentcontent($sentence);...
Read more