[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Issue 898 atomic rename, implement svn_fs_rename

From: <philip_at_codematters.co.uk>
Date: 2003-01-23 02:00:19 CET

Bill Tutt rassilon@lyra.org writes:

 As far as I know noone has reviewed the last set of changes. Cmike
 should check it out. The schema change was the big reason the change
 wasn't committed to the trunk. (and good thing too, eh? :) )
 
 Here's the list of altered files on the branch though:
 subversion/include/svn_fs.h
 subversion/libsvn_fs/tree.c
 subversion/libsvn_fs/fs.h
 subversion/libsvn_fs/txn.h
 subversion/libsvn_fs/structure
 subversion/libsvn_fs/dag.h
 subversion/libsvn_fs/dag.c
 subversion/libsvn_fs/bdb/changes-table.c
 subversion/libsvn_fs/util/fs_skels.c
 subversion/tests/libsvn_fs/fs-test.c
 subversion/tests/libsvn_fs/changes-test.c

The issue misspells fs-test.c as fs-tests.c. The branch doesn't appear
to be quite ready to merge. I'm using this script to play around

BRANCH=http://svn.collab.net/repos/svn/branches/issue-1003-dev/subversion
TRUNK=http://svn.collab.net/repos/svn/trunk/subversion
WC=../svn/subversion
for i in libsvn_fs/structure libsvn_fs/bdb/changes-table.c libsvn_fs/util/fs_skels.c libsvn_fs/fs.h libsvn_fs/tree.c tests/libsvn_fs/fs-test.c tests/libsvn_fs/changes-test.c include/svn_fs.h libsvn_fs/dag.h libsvn_fs/dag.c;do
#svn switch $BRANCH/$i $WC/$i
#svn switch $TRUNK/$i $WC/$i
#svn merge --dry-run -r4155:HEAD $BRANCH/$i $WC/$i
#svn merge --dry-run -r4389:HEAD $TRUNK/$i $WC/$i
#svn merge --dry-run -r4155:HEAD $TRUNK/$i $WC/$i
done

It doesn't compile if I simply switch the affected files to the
branch. If I attempt to merge either trunk-to-branch or
branch-to-trunk then I get confilcts.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 14 02:08:05 2006

This is an archived mail posted to the Subversion Dev mailing list.