sxemacs-devel
[Top] [All Lists]

Re: Manual merge request for the web

From: "Johann 'Myrkraverk' Oskarsson" <johann@xxxxxxxxxxxxxx>
Subject: Re: Manual merge request for the web
Date: Sun, 20 Feb 2005 23:26:37 +0000
User-agent: Gnus/5.1006 (Gnus v5.10.6) XEmacs/21.4 (Security Through Obscurity, linux)
Steve Youngs <steve@xxxxxxxxxxx> writes:

> * Johann Oskarsson <Johann> writes:
>
>   > Hi,
>   > I'm not sure what's wrong; there may be a slight bug in my tla, but my
>   > hook no longer works (after a slight change that should work according
>   > to docs).
>
> Tell us what you did, maybe we can help.

Right, I'll show you my hook file (attached at the end of the message).

I added a case against ${ARCH_CATEGORY} which I took from the tutorial
by Tom.  For some reason it seems to be empty/unset.  I'm currently
thinking of upgrading my version of tla and see what happens.

I firmly believe the category should be "sxemacs" for all the sxemacs
stuff, and "window-number" for my window number stuff.  See abrowse
for johann@xxxxxxxxxxxxxxxxxxxxxxxx

>   > Anyways, this is a merge request for:
>
>   > johann@xxxxxxxxxxxxxxxxxxxxxxx/sxemacs--myrkraverk-web--0.2
>
> Cool.  I found them easy enough, but for next time you do this
> manually, can you please include the revision number (patch-n).

I'll try to remember ;)

>   > Currently, I'm not sure how to make a diff manually, sorry about
>   > that ;/
>
> If you haven't committed your changes you can produce a diff with:
>
>   $ tla changes --diffs
>
> If you have committed, you can do:
>
>   $ tla get-changeset $(tla logs -f|tail -1) ,,my-changes RET
>   $ tla show-changeset --diffs ,,my-changes RET

I had already committed and didn't know about this magic stuff ;/

> That produces a diff of the most recent revision.  If you want a diff
> of an earlier revision, replace `$(tla logs -f|tail -1)' with
> `patch-n' (n being the patch number of course).

Do you mean: $ tla get-changeset patch-n ,,my-changes RET ?  And does
base-0 mean the original I tagged from?

*still trying to get the hang of tla*

Johann

-- 
This line is left blank intentionally

Attachment: hook
Description: Shell script: arch hook

<Prev in Thread] Current Thread [Next in Thread>