I'm using command line.
This is what I got for svn --version
svn, version 1.4.5 (r25188)
Is there any reason not to upgrade to 1.5? I am not in charge of the
repository, and I do not know which version it is running, but I think
I can recommend an upgrade for the server with the working copy on it.
Thanks for the link to the 1.4 version. I will read up there.
On Thu, Jul 24, 2008 at 2:59 PM, Eric Lee <eric_at_myprojects.srhost.info> wrote:
> Hi,
>
> Did you use command line or other GUI client.
>
> If you are use subversion command line.
> You can get the version by type in svn --version
>
> c:\> svn --version
>
> svn, version 1.4.0 (r21228)
> compiled Sep 11 2006, 17:46:59
>
> Copyright (C) 2000-2006 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_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
> - handles 'http' scheme
> - handles 'https' scheme
> * ra_svn : Module for accessing a repository using the svn network protocol.
> - handles 'svn' scheme
> * ra_local : Module for accessing a repository on local disk.
> - handles 'file' scheme
>
>
> Because that feature was new in subversion 1.5.x
> You may using subversion 1.4.x.
>
> Please checkout this if 1.4.x is your current version
> http://svnbook.red-bean.com/en/1.4/index.html
>
>
> Eric,
>
> ----------------------------------------------------
> Get subversion, phpBB 3
> http://svnbook.red-bean.com
> http://myprojects.srhost.info
> eric[at]myprojects[dot]srhost[dot]info
>
> ----- Original Message -----
> From: "Matthew Smith" <chedderslam_at_gmail.com>
> To: "Andy Levy" <andy.levy_at_gmail.com>
> Cc: "Subversion Users" <users_at_subversion.tigris.org>
> Sent: Friday, July 25, 2008 3:38 AM
> Subject: Re: weird files showing up
>
>
> : This is odd. From the page you sent me to, it appears that in version
> : 1.5, the conflict should initiate the interactive conflict resolution.
> : This does not happen.
> :
> : I'm trying to find the version of subversion we are using on this
> : server. I opened start>all programs>subversion>subversion
> : documentation and the first page says:
> : Version Control with Subversion
> : For Subversion 1.5
> :
> : Doesn't this mean we are using 1.5? If so, why doesn't the
> : interactive conflict resolution come up?
> :
> : On Thu, Jul 24, 2008 at 2:28 PM, Andy Levy <andy.levy_at_gmail.com> wrote:
> : > On Thu, Jul 24, 2008 at 15:17, Matthew Smith <chedderslam_at_gmail.com> wrote:
> : >> Running a "svn status" on the root directory gives me the following:
> : >> ? configuration.r144
> : >> ? configuration.r172
> : >> ? configuration.mine
> : >> C configuration
> : >>
> : >> How do I resolve the conflict from within the svn enviroment? I tried
> : >> running "svn update configuration" which gave me:
> : >> At revision 173.
> : >>
> : >> Is this where you would use a merge? diff? I'd like to learn how to
> : >> resolve conflicts using the tools subversion provides.
> : >
> : > Please see the manual on resolving conflicts.
> : > http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html#svn.tour.cycle.resolve
> : >
> : >> On Thu, Jul 24, 2008 at 1:29 PM, Matthew Smith <chedderslam_at_gmail.com> wrote:
> : >>> I assume that the .r144 and .r172 refer to the revision these files
> : >>> are from. What does the .mine extension mean?
> : >>>
> : >>> The actual file configuration is as we want it. So all I need to do
> : >>> is delete the files?
> : >>>
> : >>> Thank you for the help.
> : >>>
> : >>> On Thu, Jul 24, 2008 at 1:17 PM, Anthony Cagle <daerious_at_gmail.com> wrote:
> : >>>> -----BEGIN PGP SIGNED MESSAGE-----
> : >>>> Hash: SHA1
> : >>>>
> : >>>> This is standard behavior when you have a conflict, it creates these
> : >>>> files to help you find the conflict and sort out the mess each file is
> : >>>> exactly what its "file extension" sais it is, and you can use them,
> : >>>> along with conflict markers (>>>>>.mine for example) in the original
> : >>>> file to sort out the conflict.
> : >>>>
> : >>>> Matthew Smith wrote:
> : >>>>> I have just updated a working copy on the new server we are setting
> : >>>>> up. In the root directory of the working copy, there is a file
> : >>>>> "configuration" (no extension) which is used by the application. I
> : >>>>> just noticed some files that were created in the root directory:
> : >>>>> configuration.mine
> : >>>>> configuration.r144
> : >>>>> configuration.r172
> : >>>>>
> : >>>>> These appear to be older versions of the "configuration" file. svn
> : >>>>> status shows that these files are not under version control.
> : >>>>>
> : >>>>> There are many other files in subdirectories. configuration is the
> : >>>>> only file in the root directory. These three files appear to be the
> : >>>>> only ones that were created.
> : >>>>>
> : >>>>> What is going on here? This is the first time I have seen subversion
> : >>>>> do something like this, and I do not understand what is happening. Is
> : >>>>> it ok to delete these files? Why were they created?
> : >>>>>
> : >>>>> Thank you.
> : >>>>>
> : >>>>> ---------------------------------------------------------------------
> : >>>>> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
> : >>>>> For additional commands, e-mail: users-help_at_subversion.tigris.org
> : >>>>>
> : >>>>>
> : >>>>
> : >>>> -----BEGIN PGP SIGNATURE-----
> : >>>> Version: GnuPG v1.4.7 (MingW32)
> : >>>> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
> : >>>>
> : >>>> iD8DBQFIiMc8r3Km+kc2legRAkHqAKC9zFEFnOkS9YdOiKktX5O8wBdc4QCfV4NP
> : >>>> 5yVNWhzaGmnghrnj7rKCoE0=
> : >>>> =/AuR
> : >>>> -----END PGP SIGNATURE-----
> : >>>>
> : >>>>
> : >>>
> : >>
> : >> ---------------------------------------------------------------------
> : >> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
> : >> For additional commands, e-mail: users-help_at_subversion.tigris.org
> : >>
> : >>
> : >
> :
> : ---------------------------------------------------------------------
> : To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
> : For additional commands, e-mail: users-help_at_subversion.tigris.org
> :
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: users-help_at_subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-24 22:10:46 CEST