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

repeated merges... yummy

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-06-05 18:49:00 CEST

Well, cmpilato is getting ready to merge his branch back into /trunk
today, and now we can witness the 'repeated merge' problem firsthand.

You see, cmpilato has selectively ported all sort of changes from
/trunk into his branch over the last few weeks... and now he has to
port it all back into trunk again.

Just as a test, checked out a second copy of /trunk for myself, and
ran this command:

  svn merge -r1897:HEAD
    http://svn.collab.net/repos/svn/branches/issue-654-dev .

And man, oh man, I saw a LOT of G's and C's. The G's, of course, end
up looking like M's in 'svn status'. Here's the final 'svn status'.
Man, this is gonna be painful!

C ./ac-helpers/find_apr.m4
C ./ac-helpers/find_apu.m4
M ./subversion/include/svn_error_codes.h
M ./subversion/include/svn_fs.h
C ./subversion/include/svn_repos.h
A ./subversion/libsvn_fs/copies-table.c
A ./subversion/libsvn_fs/copies-table.h
C ./subversion/libsvn_fs/dag.c
C ./subversion/libsvn_fs/dag.h
M ./subversion/libsvn_fs/dbt.c
M ./subversion/libsvn_fs/dbt.h
C ./subversion/libsvn_fs/deltify.c
M ./subversion/libsvn_fs/err.c
M ./subversion/libsvn_fs/err.h
M ./subversion/libsvn_fs/fs.c
C ./subversion/libsvn_fs/fs.h
C ./subversion/libsvn_fs/fs_skels.c
M ./subversion/libsvn_fs/fs_skels.h
M ./subversion/libsvn_fs/id.c
M ./subversion/libsvn_fs/id.h
M ./subversion/libsvn_fs/key-gen.c
M ./subversion/libsvn_fs/key-gen.h
M ./subversion/libsvn_fs/node-rev.c
M ./subversion/libsvn_fs/node-rev.h
C ./subversion/libsvn_fs/nodes-table.c
M ./subversion/libsvn_fs/nodes-table.h
C ./subversion/libsvn_fs/reps-strings.c
M ./subversion/libsvn_fs/reps-strings.h
M ./subversion/libsvn_fs/rev-table.c
M ./subversion/libsvn_fs/rev-table.h
M ./subversion/libsvn_fs/structure
C ./subversion/libsvn_fs/tree.c
C ./subversion/libsvn_fs/txn-table.c
M ./subversion/libsvn_fs/txn-table.h
C ./subversion/libsvn_fs/txn.c
M ./subversion/libsvn_fs/validate.c
M ./subversion/libsvn_fs/validate.h
C ./subversion/libsvn_ra_dav/props.c
C ./subversion/libsvn_ra_dav/session.c
C ./subversion/libsvn_repos/delta.c
C ./subversion/libsvn_repos/dump.c
C ./subversion/libsvn_repos/load.c
C ./subversion/libsvn_repos/reporter.c
C ./subversion/libsvn_wc/adm_files.c
C ./subversion/svnadmin/main.c
M ./subversion/svnadmin/shell.c
C ./subversion/svnlook/main.c
M_ ./subversion/tests/clients/cmdline/svnadmin_tests.py
M ./subversion/tests/libsvn_fs/fs-test.c
M ./subversion/tests/libsvn_fs/strings-reps-test.c
M ./subversion/tests/libsvn_repos/dir-delta-editor.c

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 5 18:51:09 2002

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