Message-ID: <419A266C.1080501@arbash-meinel.com>
Date: Tue, 16 Nov 2004 10:10:20 -0600
From: John A Meinel <john@arbash-meinel.com>
User-Agent: Mozilla Thunderbird 0.9 (Windows/20041103)
MIME-Version: 1.0
To: Anand Kumria <wildfire@progsoc.org>
Subject: Re: [Gnu-arch-users] tla changes / tla tree-lint
References: <pan.2004.11.16.15.37.25.721131@progsoc.org>
In-Reply-To: <pan.2004.11.16.15.37.25.721131@progsoc.org>
Cc: gnu-arch-users@gnu.org
Precedence: list
Content-Type: multipart/mixed; boundary="===============0915156700=="
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: 2706
Lines: 82
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--===============0915156700==
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enig4B1F479839C9298AD7D3A97A"

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

Anand Kumria wrote:
> So,
> 
> I've just been working fairly heavily on a project and one of things that
> constantly annoyed me during the process was how I'd do 'tla changes' but
> it'd complain because 'tla tree-lint' wasn't satisfied.
> 
> This was because additional precious/backup files had been generated. I
> tend to use 'tla changes' a lot as a means to see what I've done and to
> determine if where I'm up to is a good commit point.
> 
> It'd be nice if there was a 'tla changes
> --assume-files-which-tree-lint-would-barf-at-are-precious --diffs' or
> similar option.
> 
> Cheers,
> Anand
> 

The problem with duplicated ids is that who is the 'true' file. If I 
originally have the files foo.c and bar.c, and then I move bar.c to 
baz.c and copy it to bar2.c, then modify both.
When you do tla changes, who is the rightful child of bar.c. Because 
either one is valid.

tla changes works by generating a changeset (the thing you commit), and 
then printing the changes. You can't generate a changeset with conflicts.

Maybe there could be an option for "--ignore-conflicts" type of thing. 
It would show you the files that conflicted, but then continue to 
generate the diffs for other files.

I do agree that something like this could be useful. Having to clean up 
your tree just to double check what you did is a little bit of a pain.

John
=:->

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

iD8DBQFBmiZxJdeBCYSNAAMRApQmAKDLkh9s8h+uodTa3yN1E9uFaAFpuwCg0Abn
5k8MgST671UKYUpe33E1Mzo=
=mmbq
-----END PGP SIGNATURE-----

--------------enig4B1F479839C9298AD7D3A97A--


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