[DUG] Source Control - Sharing files between projects

[David Brennan]

Thanks Berend. That clarifies what you were meaning. A large part of working
out how best to restructure our source control is coming to understand what
the options are, hence my questions ;-).

A couple of little questions for Berend, Paul or anyone else using Perforce.

Does Perforce make it fairly easy to see which changes have occurred in a
branch and have NOT yet been merged back into another branch (ie back into
the Reference branch)?

Also, is it fairly easy (in Perforce) to only branch off some of the files
in the reference subfolder to the project subfolder, instead of all of them?


Cheers,
David.



-----Original Message-----
From: delphi-bounces at delphi.org.nz [mailto:delphi-bounces at delphi.org.nz] On
Behalf Of Berend de Boer
Sent: Wednesday, 26 September 2007 1:30 p.m.
To: NZ Borland Developers Group - Delphi List
Subject: Re: [DUG] Source Control - Sharing files between projects

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

>>>>> "David" == David Brennan <dugdavid at dbsolutions.co.nz> writes:

    David> I am still not getting you. These are files that cannot be
    David> edited independently of a core project (unlike say vcl
    David> library files). And you can legitimately want to edit them
    David> from the context of each of the 8 projects.

    David> For an example I think you are proposing:

Exactly, you branch the /Reference/Core1 to /Project1/Core1

    David> But my interpretation of your model is that you are relying
    David> on editing each of the core files within the Reference
    David> branches and then merging through to the Project
    David> branches.

No, the reverse. You edit /Project1/Core1 and merge the changes back
to /Reference/Core1 when stable/convenient.

Perforce handles such merge back really well, unlike more primitive
tools.

    David> Furthermore it is while editing one of the projects that
    David> you would want to change one of the core files. 

And you do it exactly there.

    David> And if developers are editing the core files a various
    David> project branches then how do you get each of these changes
    David> reliably merged into the other 7 projects?

You merge the /Project1/Core1 into /Reference/Core1. Project2
developers can merge newer versions of /Reference/Core1 into
/Project2/Core1 when convenient.


    David> Unless there is some easy way of automating or at least
    David> semi-automating this in Perforce?

Perforce won't bother you with merges you already did.

- -- 
All the best,

Berend de Boer


PS: This email has been digitally signed if you wonder what the strange
characters are that your email client displays.
PGP public key: http://www.pobox.com/~berend/berend-public-key.txt
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
Comment: Processed by Mailcrypt 3.5.8 <http://mailcrypt.sourceforge.net/>

iD8DBQFG+bYRIyuuaiRyjTYRAgooAJ46C4Jzl4f6qpjAhDi27SW1zzM+awCeOGb+
V5f3P73f7yMWvfhTRN7oz9o=
=ijw6
-----END PGP SIGNATURE-----

_______________________________________________
NZ Borland Developers Group - Delphi mailing list
Post: delphi at delphi.org.nz
Admin: http://delphi.org.nz/mailman/listinfo/delphi
Unsubscribe: send an email to delphi-request at delphi.org.nz with Subject:
unsubscribe