Message-ID: <41FFBF55.5080408@arbash-meinel.com>
Date: Tue, 01 Feb 2005 11:41:41 -0600
From: John Arbash Meinel <john@arbash-meinel.com>
User-Agent: Mozilla Thunderbird 1.0 (Macintosh/20041206)
MIME-Version: 1.0
To: Rjae Easton <rjae_easton@hotmail.com>
Subject: Re: [Gnu-arch-users] How to recover from interrupted commit...
References: <BAY20-F23B6858A16A6D58B2277368E7D0@phx.gbl>
In-Reply-To: <BAY20-F23B6858A16A6D58B2277368E7D0@phx.gbl>
Cc: gnu-arch-users@gnu.org
Precedence: list
Content-Type: multipart/mixed; boundary="===============1738942235=="
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: 4511
Lines: 137
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--===============1738942235==
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enig57633D52FF05A794B11CE676"

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

Rjae Easton wrote:

>
> I am gathering that deleting the ++revision... directory unnecessary -
> and should be avoided. I am also getting the sense that during a
> commit, multiple patches may be locked. If this is true, perhaps the
> --break needs to be applied to each lock.
>
Well, honestly, manually doing anything in the archive should be avoided.

> I did some investigation of the archive and noticed a list of
> "unlocked" patches - which leads me to think that multiple locks
> exist. But the message I get is consistent with what I see elsewhere:
> cannot acquire lock (on the latest patch). That patch dir
> unfortunately does not exist.
>
Where are you seeing these? The only place I am aware of "unlocked" /
"locked" is in pristine trees in the current working directory. IE
$wd/{arch}/++pristine-trees/unlocked/...
I believe these just exist so that while you are *working* and doing
stuff like changes, etc. tla can temporarily lock the local cache of a
patch so that it doesn't get deleted.

But in the archive, there is only 1 place that real modifications take
place, and that is on the last patch. Where the
"++revision-lock/+contents" is.

When you commit, the above directory gets renamed something else while
the commit is taking place, which is then renamed again to the final
"patch-148", and then a new ++revision-lock/+contents is created.
(probably the new directory is created before the final rename, since
atomic renaming is tla's approach to locking and integrity).

I *think* it is enough to get rid of "++revision-lock-held-by..." and
re-create the ++revision-lock/+contents directories. (make sure
everything is spelled correctly and the directories have the correct
permissions.)

> I guess I was hoping that a maintenance tool had been created that
> knew how to gracefully - and if necessary interactively - return to a
> pristine state. Do you or anyone else know of such a tool?
>
I don't know of one, but "tlacontrib" and "tlatools" are good places to
look.
jblack@inframix.com--2004/tlacontrib--devo--1.3
miles@gnu.org--gnu-2004/tla-tools--devo--0
look on the supermirror http://mirrors.sourcecontrol.net/ for the
archives, and their might be newer versions of these packages.

John
=:->

>> You've done enough that I can't guarantee this will work, but it is the
>> general solution.
>> John
>> =:->
>>
>> PS> My example would fail in baz, since if you exit the gpg signature,
>> it automatically unlocks the revision. At least as of 1.1 or something
>> like that. But since your case involves an ssh disconnect, I think it is
>> still valid.
>>
>>> Thanks.
>>>
>>> --
>>> Rjae Easton
>>> Applanet, Inc.
>>> c: +1.508.369.7339
>>> e: reaston@applanet.com
>>> blog: http://blogs.applanet.com/percs/
>>> wiki: http://applanet.com/wiki/default.aspx/Rjae.HomePage
>>> aim: M1ngSheng
>>> msn: rjae_easton@hotmail.com
>>> Y!: m1ngsheng
>>>
>>>
>>>
>>>
>>> _______________________________________________
>>> 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/
>>
>>
>>
>> << signature.asc >>
>
>


--------------enig57633D52FF05A794B11CE676
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 (Darwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFB/79VJdeBCYSNAAMRAk/vAJ9xTy2ik0wufJPS+b72QzZyuddjgQCgycRh
GW90gzNBE8wuwyvte/Qk2BE=
=g8JT
-----END PGP SIGNATURE-----

--------------enig57633D52FF05A794B11CE676--


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