RE: Re: merge shows redundant updates

Hello, Stefan!

Sorry for being such a persistent one, but...

> Try again, but this time with the --force param. (fixed the docs in
> revision 5986).

My command line client (version 1.3.0 (r17949)) doesn't report any updates even with --force switch while TortoiseSVN does.

Please look at the following full scenario:
--------------
mkdir proj proj\trunk proj\branches proj\branches\br proj\branches\br-base
copy nul proj\trunk\a.txt
svn import proj svn://localhost/proj -m "importing project"
rmdir /s /q proj
svn cp svn://localhost/proj/trunk/a.txt svn://localhost/proj/branches/br -m "branching"
svn cp svn://localhost/proj/branches/br/a.txt svn://localhost/proj/branches/br-base -m "creating base"
svn co svn://localhost/proj/branches/br wc
cd wc
echo a > a.txt
svn ci -m "added a line in br/a.txt"
svn sw svn://localhost/proj/branches/br-base
echo a > a.txt
svn ci -m "added a line in br-base/a.txt"
svn sw svn://localhost/proj/trunk

svn merge --dry-run --force svn://localhost/proj/branches/br-base/a.txt svn://localhost/proj/branches/br/a.txt
[ doesn't print anything ]

svn merge --force svn://localhost/proj/branches/br-base/a.txt svn://localhost/proj/branches/br/a.txt
[ doesn't print anything ]

--------------

Attached pictures are what I get from TortoiseSVN.

Sincerely yours,
Ivan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org