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

Re: [PATCH] svn_fs_text_changed

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-11-26 01:07:32 CET

"C. Michael Pilato" <cmpilato@collab.net> writes:

> Chia-liang Kao <clkao@clkao.org> writes:
>> It's quite simple: make a local import of svn tree at rev6000 or so,
>> create a local branch, update the local import to trunk, do a merge to
>> the local branch. Now diff the local import and the branch.
> Well, I had a tough time really understanding this description. I did
> this:
> $ svn import /some/dir/of/stuff file://`pwd`/repos/dir1 -m dir1
> $ svn import /some/dir/of/stuff file://`pwd`/repos/dir2 -m dir2
> $ svn diff file://`pwd`/repos/dir1 file://`pwd`/repos/dir2

You didn't make a branch, so there's no history relating dir1 to dir2,
without history we always send delete plus add. Do it like this and
there is history:

$ stress.pl -c -F200 -D1 -N1 -n1 -x200 -s0
$ svn cp -r1 file://`pwd`/repostress/trunk file://`pwd`/repostress/branch -m ""
$ svn co file://`pwd`/repostress/branch wc
$ svn merge -r1:2 file://`pwd`/repostress/trunk wc
$ svn ci wc -m ""
$ svn diff file://`pwd`/repostress/trunk file://`pwd`/repostress/branch

200 empty diffs for history related files with identical contents.

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 26 01:10:03 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.