macosx FileMerge script

[Rob Clark <ro...@mac.com>]

Here is a script that I whipped up run after a "svn up" to find files 
in a conflicted state, and run FileMerge.app (aka opendiff) to resolve 
the conflicts.  I suppose the opendiff could be replaced with some 
other diff/merge tool on other platforms to accomplish basically the 
same thing.

If I could figure out some way to make opendiff not return immediately, 
I would probably add an "svn resolve" after opendiff returns a 
successful error code.

Re: bug when installing from tarball on MacOS 10.2.3?

[Matt Kraai <kr...@alumni.cmu.edu>]

On Sun, Jan 05, 2003 at 09:59:31PM -0500, David Casti wrote:
> I believe I have found a bug in building the r3987 tarball under MacOS
> 10.2.3.
> 
> I have obtained db-4.0.14 and the source package is in the subversion
> directory, named 'db'.
> 
> configure runs fine, but make blows up on --
> 
> cd subversion/libsvn_fs && /bin/sh /Users/david/src/subversion-r3987/libtool
> --silent --mode=link gcc  -g -O2  -DNEON_ZLIB  -L/usr/local/lib  -rpath
> /usr/local/lib -o libsvn_fs-1.la  bdb/bdb_compat.lo bdb/changes-table.lo
> bdb/copies-table.lo bdb/dbt.lo bdb/nodes-table.lo bdb/reps-table.lo
> bdb/rev-table.lo bdb/strings-table.lo bdb/txn-table.lo dag.lo deltify.lo
> err.lo fs.lo id.lo key-gen.lo node-rev.lo reps-strings.lo revs-txns.lo
> trail.lo tree.lo txn.lo util/fs_skels.lo util/skel.lo
> ../../subversion/libsvn_delta/libsvn_delta-1.la
> ../../subversion/libsvn_subr/libsvn_subr-1.la
> /Users/david/src/subversion-r3987/apr-util/libaprutil-0.la -lexpat
> /Users/david/src/subversion-r3987/db/dist/libdb-..la
> /Users/david/src/subversion-r3987/apr/libapr-0.la -lm
> libtool: link: cannot find the library
> `/Users/david/src/subversion-r3987/db/dist/libdb-..la'
> make: *** [subversion/libsvn_fs/libsvn_fs-1.la] Error 1
> 
> -- of course libdb-..la is illegal, but why did make come up with that name?
> I manually re-ran this command using the correct library name
> (libdb-4.0.la), and then re-ran 'make' and everything built fine.
> 
> I have reproduced this problem on two different MacOS 10.2.3 boxes, so I
> don't think it is unique to my environment.

I was misusing sed.  This is fixed in recent revisions, including
0.16.1.

Matt

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

bug when installing from tarball on MacOS 10.2.3?

[David Casti <da...@neosynapse.net>]

I believe I have found a bug in building the r3987 tarball under MacOS
10.2.3.

I have obtained db-4.0.14 and the source package is in the subversion
directory, named 'db'.

configure runs fine, but make blows up on --

cd subversion/libsvn_fs && /bin/sh /Users/david/src/subversion-r3987/libtool
--silent --mode=link gcc  -g -O2  -DNEON_ZLIB  -L/usr/local/lib  -rpath
/usr/local/lib -o libsvn_fs-1.la  bdb/bdb_compat.lo bdb/changes-table.lo
bdb/copies-table.lo bdb/dbt.lo bdb/nodes-table.lo bdb/reps-table.lo
bdb/rev-table.lo bdb/strings-table.lo bdb/txn-table.lo dag.lo deltify.lo
err.lo fs.lo id.lo key-gen.lo node-rev.lo reps-strings.lo revs-txns.lo
trail.lo tree.lo txn.lo util/fs_skels.lo util/skel.lo
../../subversion/libsvn_delta/libsvn_delta-1.la
../../subversion/libsvn_subr/libsvn_subr-1.la
/Users/david/src/subversion-r3987/apr-util/libaprutil-0.la -lexpat
/Users/david/src/subversion-r3987/db/dist/libdb-..la
/Users/david/src/subversion-r3987/apr/libapr-0.la -lm
libtool: link: cannot find the library
`/Users/david/src/subversion-r3987/db/dist/libdb-..la'
make: *** [subversion/libsvn_fs/libsvn_fs-1.la] Error 1

-- of course libdb-..la is illegal, but why did make come up with that name?
I manually re-ran this command using the correct library name
(libdb-4.0.la), and then re-ran 'make' and everything built fine.

I have reproduced this problem on two different MacOS 10.2.3 boxes, so I
don't think it is unique to my environment.

Thanks,
David.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org