Note that there are some explanatory texts on larger screens.

plurals
  1. POBazaar: Do I need branches?
    primarykey
    data
    text
    <p>I'm new to VCS and I'm just trying to get my head around how to use Bazaar for my situation. My situation is that I'm a solo web developer working on a web site that consists of a live website e.g. www.mysite.com and a staging/development site e.g. dev.mysite.com. I'm using Bazaar Explorer as I'm not really a command line type of guy. I just work from one main computer and I upload the files to the web server by FTP. I have Bazaar installed on my local Windows computer.</p> <p>So to get started I created a Bazaar project on my local computer. I stuck with the default 'Feature branches' option since Bazarr documentation says that this is best for small projects (but I don't fully grasp the difference between the workspace models even after reading the docs). This created a folder (which I called _Source Control) with sub folders trunk and .bzr. I copied all my project files (i.e. the website files) into trunk and did an initial commit.</p> <p>Now my first question is <strong>should I just work directly on these files or do I need to make another branch to work on?</strong></p> <p>Is this workflow a sensible approach or is there an obviously better way?:</p> <ul> <li>Work on some files in the main trunk</li> <li>FTP the updated files to the staging site as I work to check for errors, functionality, etc.</li> <li>Once I've reached a point where I've completed a certain piece of functionality, commit my changes</li> <li>Upload the latest revision to the live website using the bzr-upload plugin </li> </ul> <p>Then how should I handle the situation where I discover that the latest update has introduced a problem and I want to roll the website back to the previous revision? Is it like this:</p> <ul> <li>revert to previous version in Bazaar</li> <li>Upload this revision to the live website using the bzr-upload plugin</li> <li>then how do I get back to the latest version so that I can work on fixing the issue? Is this where I would need a branch?</li> <li>once I've updated the files again to fix the issue, do a commit and upload the latest revision to the live website using the bzr-upload plugin </li> </ul> <p>And a final question, is Checkout relevent at all in my situation?</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload