Message-ID: <4193CF92.3080305@arbash-meinel.com>
Date: Thu, 11 Nov 2004 14:46:10 -0600
From: John A Meinel <john@arbash-meinel.com>
User-Agent: Mozilla Thunderbird 0.9 (Windows/20041103)
MIME-Version: 1.0
To: John Goerzen <jgoerzen@complete.org>
Subject: Re: [Gnu-arch-users] Re: darcs vs tla
References: <20041107234609.7bf0abfe@delta.hk.office.outblaze.com>
	<slrncp74m0.ftv.jgoerzen@christoph.complete.org>
	<41939CEE.2010409@panoramicfeedback.com>
	<20041111174053.GA1818@excelhustler.com>
	<4193ACB7.5000004@arbash-meinel.com>
	<4193AFFB.9030100@arbash-meinel.com>
	<0D060DE3-341C-11D9-9D7F-000393CFE6B8@spy.net>
	<4193C7A5.4040001@arbash-meinel.com>
	<20041111202948.GB4944@excelhustler.com>
In-Reply-To: <20041111202948.GB4944@excelhustler.com>
Cc: gnu-arch-users@gnu.org
Precedence: list
Content-Type: multipart/mixed; boundary="===============2056133278=="
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: 3907
Lines: 135
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--===============2056133278==
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enigD6785815B57E989E802F8FD6"

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

John Goerzen wrote:
> On Thu, Nov 11, 2004 at 02:12:21PM -0600, John A Meinel wrote:
> 

[...]

>>1) How do you tell darcs that you want the most recent version of the 
>>source tree, with the current modifications then applied (meaning the 
>>archive is more important than my changes. This updates to the latest 
>>archive version, and then applies my changes.)
>>
>>   tla update
> 
> 
> No direct equivolent here (see darcs pull), but otoh, I can never think
> of an instance where tla update has been better for me than tla replay,
> and also can't really think of one where it would be.
> 

I've done some changes, found out someone else might have done something 
similar, etc. I generally use replay myself. You could fake an update 
with 'tla undo; tla replay; tla redo' that's basically what it does, 
only I think it is *slightly* smarter.

> 
>>2) How do you state that my changes are more important. (This applies 
>>each missing patch until one fails.)
>>
>>   tla replay
> 
> 
> darcs pull
> 
> 
>>3) How do you say. Well, I've done all these changes on a branch, and 
>>now I'm ready to commit it to the main branch as one logical merge.
>>
>>   tla star-merge
> 
> 
> darcs pull
> 

My understanding was that this pulls each change as a separate entity. 
Does it make a record such that all the changes can be easily pulled in 
later?

By your response darcs push records each one individually, and darcs 
pull records a meta patch.

> 
>>4) Each change I just did should be entered into the main branch as an 
>>individual change set.
>>
>>   tla pure-merge (theoretical)
> 
> 
> darcs push
> 
> 
>>I realize tla is not very simple, but some of that is because it lets 
>>you do complicated things. I completely agree with you that the basic 
> 
> 
> I'm not sure tla really permits things that darcs dosen't.  Can you give
> an example?
> 
> 
>>having darcs take 1 hour to commit a change is plenty of time for me to 
>>figure out what the difference is between update/replay, and then I 
>>don't have to worry about it again.
> 
> 
> To make it clear, that is a bug in darcs that needs to be fixed.
> 

Is this explicitly a bug, or is it something where because of it's basic 
patch-algebra design it is stuck with this.

> -- John

I also happen to prefer having a semi-centralized repository, because 
then if I wipe my working dir, I know I haven't lost anything.

I'm guessing baz could probably make things about as simple as darcs, 
though. With the caveat that you have to be aware of a repository versus 
just working trees.

John
=:->

--------------enigD6785815B57E989E802F8FD6
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

iD8DBQFBk8+SJdeBCYSNAAMRAnEIAKClgMCXqkiYX7oB6DvVmBWKlmcCXQCdGQoq
1nhqdU14FTNYBi++hhXEyJY=
=9Fo4
-----END PGP SIGNATURE-----

--------------enigD6785815B57E989E802F8FD6--


--===============2056133278==
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/
--===============2056133278==--