Message-ID: <4193AFFB.9030100@arbash-meinel.com>
Date: Thu, 11 Nov 2004 12:31:23 -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>
In-Reply-To: <4193ACB7.5000004@arbash-meinel.com>
Cc: Aaron Bentley <abentley@panoramicfeedback.com>, gnu-arch-users@gnu.org
Precedence: list
Content-Type: multipart/mixed; boundary="===============1243885001=="
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: 3336
Lines: 114
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--===============1243885001==
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enig3F8B3050B7642538EF28CF94"

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

John A Meinel wrote:
> John Goerzen wrote:
> 
>> On Thu, Nov 11, 2004 at 12:10:06PM -0500, Aaron Bentley wrote:
>>

[...]

>>
>>
>> It's committing, and having everything preserved.  With Arch, it's:
>>
>> 1. A lot of work to tag something to a local repo, do all of that crap,
>> then merge it back later, and finally commit it back later
>>
>> 2. This approach loses the diffs for each individual commit that was
>> done, at least in the master repository.
>>
>> -- John
>>
> 

Just to clarify, this is what you could do.

$ tla get $REMOTE wd
$ cd wd
  go offline
  hack hack hack

  Oops I want to commit and I'm offline:

$ tla-branch-this $LOCAL  #This is the aba/fai command 'aba branch-this'
$ tla commit
  hack hack
$ tla commit
  hack hack
$ tla commit

  Come back online

$ cd ..
$ tla get $REMOTE rem_wd
$ cd rem_wd
$ tla-pure-merge $LOCAL

Is that very difficult compared with what you do in darcs? Yes, tla 
doesn't have this built-in, but it is pretty easy to layer this 
functionality on top. And if you convince Tom, you probably could get a 
'tla pure-merge' command that would do the same thing.

The only thing I really see failing is that 'tla-branch-this' may fail 
in disconnected mode. I don't know if you can tag without being able to 
access the archive. Though I would guess when Aaron's cache stuff get's 
sorted out, this would not be a problem.

John
=:->

PS> The script could probably use a 'set -e' in the beginning so it
     doesn't just keep going after a failure.
     And it might be better to do something like 'tla replay $p' instead
     of using 'tla star-merge $p', I'm not positive on all the details.
     Your comment that the length of what you have to type does still
     hold, but I might point you to any of the front-ends which generally
     have support for aliases. I personally use aba (fai doesn't run on
     cygwin yet.). It comes with branch-this, would be really
     easy to add pure-merge, and has pretty good aliases support.


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

iD8DBQFBk6/7JdeBCYSNAAMRAvUaAJ9RSDhUUL3BZxWMuCe9LMasWIfx4ACgwRzP
8Ac6NDngs6YQV28eZPxcMKk=
=dIKt
-----END PGP SIGNATURE-----

--------------enig3F8B3050B7642538EF28CF94--


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