Re: tree conflict on tc_url_rev branch?

Paul Burba wrote:
> The thing that worries me much more than any of the preceding, is why
> didn't Stefan's sync-up commit in r34325 add
> 'notes\tree-conflicts\use-cases-resolution.txt'? I just tried to
> replicate the synch merge and the file *was* added using a trunk_at_34403
> build:

Then, maybe a bug was fixed in the meantime, not?

>
> C:\SVN\src-branch-tc_url_rev>svn info
> Path: .
> URL: http://svn.collab.net/repos/svn/branches/tc_url_rev
> Repository Root: http://svn.collab.net/repos/svn
> Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
> Revision: 34324
> Node Kind: directory
> Schedule: normal
> Last Changed Author: stsp
> Last Changed Rev: 34324
> Last Changed Date: 2008-11-21 17:01:40 -0500 (Fri, 21 Nov 2008)
>
>
> C:\SVN\src-branch-tc_url_rev>svn merge
> http://svn.collab.net/repos/svn/trunk -r0:34324 --accept postpone
> --- Merging r34284 through r34324 into '.':
> A notes\tree-conflicts\use-cases-resolution.txt
> U subversion\libsvn_subr\config_file.c
> U subversion\libsvn_subr\dirent_uri.c
> U subversion\libsvn_subr\mergeinfo.c
> U subversion\tests\libsvn_subr\dirent_uri-test.c
> U subversion\tests\cmdline\stat_tests.py
> U subversion\tests\cmdline\info_tests.py
> U subversion\tests\cmdline\merge_tests.py
> U subversion\svn\status.c
> U subversion\svn\schema\info.rnc
> C subversion\svn\tree-conflicts.c
> U subversion\svn\main.c
> U subversion\svn\tree-conflicts.h
> U subversion\svn\info-cmd.c
> U subversion\include\svn_dirent_uri.h
> C subversion\include\svn_wc.h
> U subversion\include\private\svn_wc_private.h
> U subversion\include\private\svn_mergeinfo_private.h
> U subversion\libsvn_wc\util.c
> U subversion\libsvn_wc\adm_ops.c
> U subversion\libsvn_wc\status.c
> U subversion\libsvn_wc\tree_conflicts.c
> U subversion\libsvn_client\merge.c
> U subversion\libsvn_repos\reporter.c
> U INSTALL
> U TODO-1.6
> Summary of conflicts:
> Text conflicts: 2
>
> Even stranger, using 1.5.4 it still works:
>
> C:\SVN\src-branch-tc_url_rev-1.5.4WC>\SVN\svn-win32-branch-1.5.4.RELEASE\bin\svn.exe
> info
> Path: .
> URL: http://svn.collab.net/repos/svn/branches/tc_url_rev
> Repository Root: http://svn.collab.net/repos/svn
> Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
> Revision: 34324
> Node Kind: directory
> Schedule: normal
> Last Changed Author: stsp
> Last Changed Rev: 34324
> Last Changed Date: 2008-11-21 17:01:40 -0500 (Fri, 21 Nov 2008)
>
>
> C:\SVN\src-branch-tc_url_rev-1.5.4WC>\SVN\svn-win32-branch-1.5.4.RELEASE\bin\svn.exe
> merge http://svn.collab.net/repos/svn/trunk -r0:34324 --accept
> postpone
> --- Merging r34284 through r34324 into '.':
> A notes\tree-conflicts\use-cases-resolution.txt
> U subversion\libsvn_subr\config_file.c
> U subversion\libsvn_subr\dirent_uri.c
> U subversion\libsvn_subr\mergeinfo.c
> U subversion\tests\libsvn_subr\dirent_uri-test.c
> U subversion\tests\cmdline\stat_tests.py
> U subversion\tests\cmdline\info_tests.py
> U subversion\tests\cmdline\merge_tests.py
> U subversion\svn\status.c
> U subversion\svn\schema\info.rnc
> C subversion\svn\tree-conflicts.c
> U subversion\svn\main.c
> U subversion\svn\tree-conflicts.h
> U subversion\svn\info-cmd.c
> U subversion\include\svn_dirent_uri.h
> C subversion\include\svn_wc.h
> U subversion\include\private\svn_wc_private.h
> U subversion\include\private\svn_mergeinfo_private.h
> U subversion\libsvn_wc\util.c
> U subversion\libsvn_wc\adm_ops.c
> U subversion\libsvn_wc\status.c
> U subversion\libsvn_wc\tree_conflicts.c
> U subversion\libsvn_client\merge.c
> U subversion\libsvn_repos\reporter.c
> U INSTALL
> U TODO-1.6
>
> Neels, when you reproduced the problem with 1.5.1 how exactly were you
> doing this?

I was using the ubuntu 8.04 binary packaged svn:
$ svn --version
svn, version 1.5.1 (r32289)
   compiled Oct 6 2008, 12:54:52

Copyright (C) 2000-2008 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (http://www.Collab.Net/).

The following repository access (RA) modules are available:

* ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
  - handles 'http' scheme
  - handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
  - with Cyrus SASL authentication
  - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' scheme

previously...
svn co $svnrepos/trunk
svn co $svnrepos/branches/tc_url_rev branch

<some development going on, but always updating/committing on the whole
working copy>

then, AFAIR, ...
cd branch
svn merge $svnrepos/trunk .
and
svn merge $svnrepos/trunk/notes/foo ./notes/foo
svn merge --ignore-ancestry $svnrepos/trunk .
and stuff, all without success.

Maybe adding -r0:3xxxx would have done the trick?
No idea.

~Neels