manage.... clones? or branches?

[Max Bowsher]

On 22/12/10 14:48, Krilin Wantun wrote:

Subject: manage.... clones? or branches?

In Bazaar, clone and branch refer to the same operation.

> Hi all, just new in here...
> 
> I'm evaluating different CVS to see which fits my needs

Terminology note: CVS (Concurrent Versions System) is the name of one
particular VCS (Version Control System) :-)

> and I'm
> wondering if Bazaar con manage a main repository and several clones, I
> work on web ASP.NET projects, where I have a main repository and then I
> clone it to adapt to each customer, where I change a few files to adapt
> the needs of the customer without afecting the main repository. Also,
> doing so, sometimes I make changes on the client I have to commit back
> to the main repository, so the schema is:
> 
> REPO <-----> CLIENT 1
>  |
>  |<-----------> CLIENT 2
> .... etc
> 
> Can I manage this with Bazaar? I've been testing with branches (just
> started using it) but Í'm not clear about that

I believe the natural way to manage such a scenario in Bazaar (or Git or
Mercurial - the underlying principles are not that different) would be
to have a main branch (what you are calling "main repository", but
"repository" has specific meaning in Bazaar different to how you are
using it), and a number of client-specific branches branched from it.

You would then do normal full merges from the main branch into client
branches as necessary.

When you have a change in a client branch which needs to go back to the
main branch, you would do a cherrypick merge - the kind of merge which
doesn't get recorded in the overall ancestry tree, because its a merge
of a single change alone - not a change and all the changes which led up
to it.


Max.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20101222/f83ada03/attachment.pgp