Repository Structure

[kjedrusiak]

See the atteched .PNG file for a sample setup of a new repository.

We have some projects worked on by one programmer and some by multiple programmers.
(Don't want to preclude multiple programmers on the other projects.)

Does the structure in the pic make sense?

[Beth]

I've seen some cases where customers have a folder for each programmer and then merge the changes among programmers and back to trunk. That will mean more folder level merging to get changes where they belong.

You can have everyone working from the same folder as well and just allow multiple check outs. Then users could get new code as it's checked into the repository and merge it with their disk version to keep themselves updated with the latest.

If your users don't want to receive other user's updates though, but you want to merge their changes to the trunk or another branch,then giving them their own branches makes sense.

This really depends what you want to accomplish. Can you describe further?

[kjedrusiak]

Earlier in the year we changed from C/E/C to E/M/C style. We are not a large shop...there are only three programmers.

On our main app we can have all three programmers working in a number of the same files at the same time. We are NOT using branches. For the latest set of changes there was some pilot error, a number of code changes were overwritten. We didn't loose anything per say, but we had to go hunt history for the missing code.

Sometimes one programmer is going off on a tanget...we don't want that to pollute the trunk or the other programmers.

[Beth]

Are the folders that are called Kyle, Patricia, and Rod then not copies of the project? Maybe just small test areas? Or are they completely separate projects?

Is the folder labeled Branches just complete copies of the project?

[kjedrusiak]

This is a "sample" configuration of a new repository. (The old one is all fudged up)

The kyle, patricia and rod folders will be their branch of the trunk

[Beth]

You had said you weren't using branches, so is it safe to assume that where you say branches that you actually mean an entire copy of the code? Or do you mean that you use our branch function?

Who will be taking care of the merging changes from the developers "branches" to the trunk? Or, do you mean to never move those changes back to the trunk?

[kjedrusiak]

Can I call you or can you call me? Seems like I have you confused.

(732) 906-5660

If not...

We were not using branching in tha past at all and I want to start using branches going forward.

Not sure what else I can tell you.

[Beth]

Could you send an email to support at sourcegear.com (attn: Beth) with a link to this forum thread?

Resolved offline
HS: 216354