On Mon, Aug 25, 2008 at 9:03 PM, <hwright_at_tigris.org> wrote:
> Author: hwright
> Revision: 32710
> Property Name: svn:log
> Action: modified
> Property diff:
> --- old property value
> +++ new property value
> @@ -1,9 +1,5 @@
> On the fs-rep-sharing branch:
> -Only reuse file reps if the schema version is the right one.
> +Bring up-to-date with trunk. This decreases the cumalative diff due to the
> +previous merge of the svn_checksum_t work to trunk.
> -* subversion/libsvn_fs_base/fs.h
> - (SVN_FS_BASE__MIN_REP_SHARING_FORMAT): New.
> -* subversion/libsvn_fs_base/dag.c
> - (svn_fs_base__dag_finalize_edits): Only remove the old rep if our
> - format is recent enough.
> +Made possible by: pburba
Given the problems we've discussed in IRC with this merge, I decided
to diff fs-rep-sharing_at_32710 and trunk_at_32710 and noticed one problem:
It doesn't appear that r29126 was ever merged from trunk to
fs-rep-sharing despite the mergeinfo claiming this was the case. It
seems that the r29289 synch merge to fs-rep-sharing should have picked
this up but didn't.
Whenever you have some time could you look at this and see if you agree?
Other than that it looks fine. I still feel like some of the
conflicts you got in r32710 (assuming you got the same 15 I got*)
could be avoided with some more refinements to the merge code and/or
some prepatory --record-only merges in advance of the cyclic merge,
but at least you can now do the merge.
* Conflicting files when merging . -r0:32709 from
http://svn.collab.net/repos/svn/trunk to fs-rep-sharing@32709:
subversion/tests/libsvn_subr (PROP CONFLICT)
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-26 18:16:13 CEST