[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[TSVN] Skipped files during merge

From: <sreinstein_at_e-sim.co.il>
Date: 2004-11-11 09:38:38 CET

Hi,

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.

Workaround: Checking-out a fresh copy of the trunk from the repository seems to
fix the problem - merging using TortoiseSVN works and does not show the
"Skipped" output.

This problem does not always happen; it only happened to me twice, out of dozens
of such merges. I'm using the latest TortoiseSVN release - 1.1.1, build 1857.

Thanks,
Shlomy

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Nov 11 09:45:49 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.