Re: [TSVN] tortoise merge bug?

johan laenen wrote:

> Whenever I select a file in whatever directory and try a turtoise
> merge the From: (start URL) always shows the last file I already did a
> merge on, NOT the currently selected file.

That's because you usually don't merge single files but directories. And
if you merged from e.g. a specific branch to trunk (or changes in trunk
to your private branch), then you want the previous URL kept there
because that's the URL you most likely will use again for your merge.

> At the bottom of the popup however the result of the merge will be
> stored in the correct working copy.

Sure: you selected something in your working copy. That's where the
merge is stored. You can't store a merge result anywhere else than in
your working copy.

> one directory, in it three files: alfa.txt, beta.txt and gamma.txt, revision 10.
>
> i've already done a beta.txt merge to bring this file back to revision
> 2. now I want to do the same for alfa.txt. I select alfa.txt but
> turtoise merge shows me the path to beta.txt. The result however will
> be stored in alfa.txt. This will not work.

Well, the merge will 'work', but you'll most likely will get a conflict.

Stefan

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