From: Esben Mose Hansen <arch@mosehansen.dk>
To: gnu-arch-users@gnu.org
Subject: Re: [Gnu-arch-users] Re: Creating a diif (-uN) from two revisions
Date: Mon, 25 Oct 2004 19:35:57 +0200
User-Agent: KMail/1.7
References: <200410241650.04234.arch@mosehansen.dk> <tnxd5z7c6uc.fsf@arm.com>
In-Reply-To: <tnxd5z7c6uc.fsf@arm.com>
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_9lTfBWYZKi2UDBz"
Message-Id: <200410251935.57347.arch@mosehansen.dk>
Precedence: list
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: 1873
Lines: 68
--Boundary-00=_9lTfBWYZKi2UDBz
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

On Monday 25 October, 2004 14:36, Catalin Marinas wrote:
> Esben Mose Hansen <arch@mosehansen.dk> writes:

[...]

>
> diff -x \{arch\} -x .arch-ids -x .arch-inventory -x \, revision1 revision2
>
> Another option is to use "tla changes/delta --diffs" and fix the
> generated patch with the attached script.

I ended going this route, except that I used the changeset instead and the 
attached script.

Again, thanks for everybodys help :-D I amI perversely pleased that it wasn't 
an "error 40", at least :)

-- 
regards, Esben

--Boundary-00=_9lTfBWYZKi2UDBz
Content-Type: application/x-shellscript;
  name="tla-makepatch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="tla-makepatch"

#!/bin/bash

if [ $# != 2 ]
then
	echo "Make patch between to revisions"
	echo "  Usage: tla-makepatch old-revision new-revision"
	exit 1
fi

old=$(tla revisions --full $1 |tail -n1)
new=$(tla revisions --full $2 | tail -n1)

delta=,,tla-makepatch-$$-delta

rm -rf $delta
tla delta $old $new $delta >/dev/null 2>&1
diff -uNr $delta/removed-files-archive $delta/new-files-archive --exclude "{arch}" --exclude .arch-ids | sed -e "s/$delta\/removed-files-archive/orig/" -e "s/$delta\/new-files-archive/mod/" -e /^diff/d
find ./$delta/patches  \( -path '*{arch}' -prune \) -or -type f -exec cat {} \;
rm -rf $delta

--Boundary-00=_9lTfBWYZKi2UDBz
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/
--Boundary-00=_9lTfBWYZKi2UDBz--