Message-ID: <41B08BBD.8050303@arbash-meinel.com>
Date: Fri, 03 Dec 2004 09:52:29 -0600
From: John A Meinel <john@arbash-meinel.com>
User-Agent: Mozilla Thunderbird 0.9 (Windows/20041103)
MIME-Version: 1.0
To: Aaron Bentley <abentley@panoramicfeedback.com>
Subject: Re: [Gnu-arch-users] Splitting a project to config based
References: <41B0859D.5070208@mpathix.com>
	<41B088F0.1020003@panoramicfeedback.com>
In-Reply-To: <41B088F0.1020003@panoramicfeedback.com>
Cc: Milan Cvetkovic <milan.cvetkovic@mpathix.com>, gnu-arch-users@gnu.org
Precedence: list
Content-Type: multipart/mixed; boundary="===============0379754238=="
Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Status: RO
Content-Length: 3119
Lines: 104
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--===============0379754238==
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enig9F14E8464DC4E65E11965E70"

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig9F14E8464DC4E65E11965E70
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Aaron Bentley wrote:
> Milan Cvetkovic wrote:
> 
>> Suppose I have a big project BASE which I want to split into BCHILD 
>> and BLIB, each containing significant portion of files from B, say 50% 
>> each.
>>
>> I would create a new project CFG with config files.
>>
>> Should I tag BCHILD and BLIB of BASE, and remove unneeded files in each?
> 
> 
> I'd recommend that approach.  In general, it makes merging easier.
> 

I agree with tagging. I've actually done this. One more step that you 
might consider is after you have done tag and then deleted the files you 
want and moved them around, you can issue a:

cd $BASE
tla sync-tree $BCHILD
tla sync-tree $BLIB
tla commit -s "Sync with child projects"

sync-tree basically says that I want it to look like I pulled in the 
patches. After doing this, you can actually star-merge back and forth 
between your child and your base.

It sounds like you don't really need that functionality, but I thought 
to let you know it was available.

There are a couple caveats with the merging, for new file additions, 
they will show up in exactly the new place, instead of properly located 
in the old place. Example:

   $BASE/src/stuff1/
   $BASE/lib/otherstuff/

After tagging, and then removing the extra files you get

   $BASE/src -> $BCHILD/stuff1
   $BASE/lib -> $BLIB/

If you add a file in:
   $BLIB/newfile.txt

When you star-merge back into $BASE, you will get the file in
   $BASE/newfile.txt

instead of
   $BASE/lib/newfile.txt

There has been some discussion about how to fix this, because it is 
frequently useful to keep a broken up project, and one that stays 
together. (Also if I've renamed a directory, and merge with someone else 
who added a file in that directory, it will show up in the old place.)

John
=:->

--------------enig9F14E8464DC4E65E11965E70
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Cygwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFBsIvBJdeBCYSNAAMRAilHAKCAcTafvTcyLPOP9dZrCLI1PT5Q2wCeNKB0
9vJknCHXwXF7cvi27VRplFk=
=hRYf
-----END PGP SIGNATURE-----

--------------enig9F14E8464DC4E65E11965E70--


--===============0379754238==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Gnu-arch-users mailing list
Gnu-arch-users@gnu.org
http://lists.gnu.org/mailman/listinfo/gnu-arch-users

GNU arch home page:
http://savannah.gnu.org/projects/gnu-arch/
--===============0379754238==--