Nubee question

[Gary van der Merwe]

On Thu, Jul 23, 2009 at 5:24 AM, Simon<greminn at gmail.com> wrote:
> Thanks for the reply Gary.. you are correct - we are not using any vcs at
> the moment.
>
> I have read thru your notes and they are good to get the 'process' in my
> head - thank you!... A couple of questions if i may:
>
> 1). dev1 and dev2 might have different projects that they work on and dont
> really need to share to the other branch, so in this case we would only be
> wanting to check out the contents of a single application (rather than the
> entire code for all projects) to either or both branches... is this where
> you have a "tree" (all the code that either of our branches work on) and
> "trunks" (folders within that tree)? So a branch can check out a trunk:
>
> tree:
> -- application1 (only to dev1)
> -- application2 (only to dev2)
> -- application3 (both)
>
> Is that the correct way of looking at it?

Yes. You can then make app1, app2, and common each  it's own branch.
You may need to do the process described in the previous mail on
common (app2).

Ideally, you want it so that when you are working on say app1, when
you pull/commit/push, etc, it does the action on both the app1 and
common branches. The ideal solution for this is called nested trees.
This feature is unfortunately not completed, so in mean time, I would
recommend using a plugin called scm-proj, which provides the same
functionality, but is a work-around manor.
(https://launchpad.net/bzr-scmproj)

> 2). All of our devs work on windows workstations and use Zend Studio to code
> with - most of them have only rudmentry linux command line knowledge and im
> thinking would rather use some sort of web-based tool to check in/out/bla..
> Any good pointers here?

Not web based, but a good gui: bzr-explorer (http://bazaar-vcs.org/BzrExplorer)

> 3). Its when you get to managing conflicts that the whole think gets much
> more difficuit.. is there a easy way (aka web based gui) that can assist
> here?

I'm sure that bzr will handle 90% of the merges that you need to do
automatically. You will still have some conflicts, and I would
recommend using qconflicts to launch meld to help you resolve these.

Regards,

Gary