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 07:34:49 +1000
Organization: The SXEmacs Project
User-agent: Gnus/5.110003 (No Gnus v0.3) SXEmacs/22.1.2 (Audi, linux)
* 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.

  > 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).

  > 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

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).


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

Attachment: pgpRu5r4Itb0z.pgp
Description: PGP signature

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