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
Received on 2008-07-24 21:28:27 CEST