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

sqlite-mergeinfo-without-mergeinfo and sqlite-deep-copies branches

From: Arfrever Frehtes Taifersar Arahesis <arfrever.fta_at_gmail.com>
Date: Fri, 25 Jan 2008 17:10:03 +0100

r28127 | glasser | 2007-11-28 23:53:26 +0100 (Wed, 28 Nov 2007) | 14 lines
Changed paths:
   A /branches/sqlite-mergeinfo-without-mergeinfo (from /trunk:28126)

Experimental branch to try minimizing the data stored in the sqlite
database so that it is just

CREATE TABLE mergeinfo
  ( path TEXT NOT NULL,
    revision INTEGER NOT NULL,
    action INTEGER NOT NULL );

where action is an enum representing 'added', 'modified', or
'deleted'.

See:
  http://svn.haxx.se/dev/archive-2007-11/1181.shtml

------------------------------------------------------------------------
r28196 | glasser | 2007-12-03 01:23:06 +0100 (Mon, 03 Dec 2007) | 2 lines
Changed paths:
   A /branches/sqlite-deep-copies (from /branches/sqlite-mergeinfo-without-mergeinfo:28195)

Rebranch sqlite-deep-copies from sqlite-mergeinfo-without-mergeinfo.

------------------------------------------------------------------------
r28245 | kfogel | 2007-12-04 23:43:50 +0100 (Tue, 04 Dec 2007) | 3 lines
Changed paths:
   A /branches/whole-branch-merge (from /branches/sqlite-deep-copies:28244)

Quick branch for experimentation with a common merge case.
With dlr and glasser; like r28242 but from a better source.

------------------------------------------------------------------------
r28428 | kfogel | 2007-12-12 02:59:09 +0100 (Wed, 12 Dec 2007) | 12 lines
Changed paths:
   A /branches/reintegrate (from /branches/whole-branch-merge:28427)
   M /branches/reintegrate/subversion/include/svn_client.h
   M /branches/reintegrate/subversion/libsvn_client/merge.c
   M /branches/reintegrate/subversion/svn/merge-cmd.c
   D /branches/whole-branch-merge

Rename the 'whole-branch-merge' branch to 'reintegrate', and rename
its principal API similarly.

* subversion/include/svn_client.h
  (svn_client_merge_reintegrate): Renamed from svn_client_merge_whole_branch.
    Fix up doc string.

* subversion/svn/merge-cmd.c
  (svn_cl__merge): Adjust caller.

* subversion/libsvn_client/merge.c: Adjust comment.

------------------------------------------------------------------------

reintegrate branch was merged to trunk in r28979, so it seems that
sqlite-mergeinfo-without-mergeinfo and sqlite-deep-copies branches could be
deleted.

-- 
Arfrever Frehtes Taifersar Arahesis

Received on 2008-01-25 17:16:25 CET

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