Re: Error in TSVN help file "Resolving Conflicts"?

On 12/7/05, Simon Large <simon@skirridsystems.co.uk> wrote:
> Leon Zandman wrote:
> > I was just reading the TSVN help file section "5.6 Resolving Conflicts".
> > Here it is said that in case of a conflict Subversion creates a
> > "filename.ext.mine" file. TSVN however seems to create a file called
> > "filename.ext.work". Why the difference and shouldn't this be corrected
> > in the manual?
>
> SVN creates those conflict files, not TSVN. And it seems that the
> filenames differ depending on how the conflict was created.
>
> Create a conflict using merge:
> filename.ext.working
> filename.ext.merge-left.rxx
> filename.ext.merge-right.ryy
>
> Create a conflict by changing the same file (differently) in 2 WCs:
> filename.ext.mine
> filename.ext.rxx
> filename.ext.ryy
>
> And you somehow got filename.ext.work (no 'ing' at the end?) or was that
> a typo?
>
> The subversion book is slightly at variance with this, and I am querying
> it with them at the moment.

That changed in between releases of Subversion. So both is correct
(with and without "ing" at the end), depending on the version you're
using.

Stefan

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
--