Re: [TSVN] Skipped files during merge

sreinstein@e-sim.co.il wrote:

> Trying to merge changes from a branch into the trunk, the dialog showing the
> merge output (or progress) correctly showed all the files that should have been
> merged, but "Skipped" was displayed in front of each file, and indeed the merge
> did not change the working copy at all. (Needless to say, I didn't use the "dry
> run" option...)
> Running the same merge from the command-line ("svn merge ..." in the same
> working copy, same parameters as specified in the Tortoise dialog) worked
> correctly - nothing was skipped.

If this happens again, try the command line client again. But this time,
specify the path to the working copy as an absolute path! Don't just cd
into your working copy and do the switch from there. Subversion had/has
some problems with absolute paths - they don't show up normally with the
command line client so they don't notice the bug, but TSVN and most
other GUI clients use absolute paths...

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