sxemacs-devel
[Top] [All Lists]

Re: Manual merge request for the web

From: Steve Youngs <steve@xxxxxxxxxxx>
Subject: Re: Manual merge request for the web
Date: Mon, 21 Feb 2005 08:50:28 +1000
Organization: The SXEmacs Project
User-agent: Gnus/5.110003 (No Gnus v0.3) SXEmacs/22.1.2 (Audi, linux)
* Johann Oskarsson <Johann> writes:

  > 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 personally use:

       ndim-utils--main--0.1 at
     
       hun@xxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
       http://arch.n-dimensional.de/2004-public

It gives _very_ flexible control over your hooks.  It allows me to run
different things based on archive, category, branch, version,
revision.  Which is pretty much what you are trying to do in your
script. :-)

  > 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

Yes, you are correct.

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

Yes.


-- 
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
|                        In space,                         |
|             No one can hear you rip a stinky             |
|------------------------------------<steve@xxxxxxxxxxx>---|

Attachment: pgpFtBWmmddsx.pgp
Description: PGP signature

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