subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From James Hanley <jhan...@dgtlrift.com>
Subject Tree conflict on Fresh checkout
Date Tue, 04 Jun 2013 17:43:37 GMT
We are seeing a strange anomaly after our last check-in - on fresh checkout
there is a tree conflict into a new path - I've included the output below.

user_dude@computer_node~/projects/my_project
$ svn co https://svn.my_company.com/svn/my_project_fw/branches/int/
my_project_03b my_project_03b_pristine
A    my_project_03b_pristine/Test
A    my_project_03b_pristine/Test/Global
A    my_project_03b_pristine/Test/Global/Default
A    my_project_03b_pristine/Test/Global/Default/Configuration
A    my_project_03b_pristine/Test/Global/Default/Configuration/TEMPLATE.asn
...
A    my_project_03b_pristine/Project/settings/run.cmd
A    my_project_03b_pristine/Project/settings/MkSharedData.exe
  C my_project_03b_pristine/Project/settings/MkImage
  A my_project_03b_pristine/Project/settings/MkImage/main.c
  A my_project_03b_pristine/Project/settings/MkImage/defs.h
  A my_project_03b_pristine/Project/settings/MkImage/Makefile
A    my_project_03b_pristine/Project/settings/hex_to_hex.exe
A    my_project_03b_pristine/Project/settings/composit.cmp
A    my_project_03b_pristine/Project/settings/GenCrc.pl
...
A    my_project_03b_pristine/Documentation/Architecture.docx
A    my_project_03b_pristine/.pydevproject
A    my_project_03b_pristine/Makefile
A    my_project_03b_pristine/.settings
A    my_project_03b_pristine/.settings/org.eclipse.cdt.codan.core.prefs
U   my_project_03b_pristine
Checked out revision 2577.

user_dude@computer_node~/projects/my_project
$ svn status
svn: warning: W155007: '/cygdrive/D/Users/user_dude/projects/my_project' is
not a working copy

user_dude@computer_node~/projects/my_project
$ cd my_project_03b_pristine/

user_dude@computer_node~/projects/my_project/my_project_03b_pristine
$ svn status
D     C Project/settings/MkImage
     >   local unversioned, incoming add upon update
D       Project/settings/MkImage/Makefile
D       Project/settings/MkImage/defs.h
D       Project/settings/MkImage/main.c
Summary of conflicts:
 Tree conflicts: 1

user_dude@computer_node~/projects/my_project/my_project_03b_pristine
$


This happens on svn 1.7.9 and 1.7.10, but not 1.7.6, 1.6.13, nor on
TortoiseSVN of the last couple of revs.
$ svn --version
svn, version 1.7.9 (r1462340)
   compiled Apr 14 2013, 10:11:47

Copyright (C) 2013 The Apache Software Foundation.
This software consists of contributions made by many people; see the NOTICE
file for more information.
Subversion is open source software, see http://subversion.apache.org/

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
* ra_serf : Module for accessing a repository via WebDAV protocol using
serf.
  - handles 'http' scheme
  - handles 'https' scheme

$ svn --version
svn, version 1.7.10 (r1485443)
   compiled Jun  1 2013, 14:51:22

Copyright (C) 2013 The Apache Software Foundation.
This software consists of contributions made by many people; see the NOTICE
file for more information.
Subversion is open source software, see http://subversion.apache.org/

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
* ra_serf : Module for accessing a repository via WebDAV protocol using
serf.
  - handles 'http' scheme
  - handles 'https' scheme


Since I have a workaround (TortoiseSVN) is there anything I should be
concerned about with this revision?
Is this anomaly or artifact going to cause problems for us later with our
current version of SVN?
Is this anomaly or artifact going to cause problems for us later, when
upgrading to a new version of SVN.
How was this caused?
Is there additional information (property/meta data) that can help
pin-point the cause?

Thanks much, take care,
-Jim

Mime
View raw message