On Tuesday 30 May 2006 23:46, Giovanni Bajo wrote:
> Alexey Neyman wrote:
>
>> Again, the same setup: I imported several large repository
>> snapshots on a vendor branch. Then I deleted some files and
>> directories on the trunk. Now I'm trying to get a patch agains one
>> of those snapshots of vendor sources, in order to merge back to
>> their CVS. The problem is that the directory I deleted does not
>> appear in that patch at all.
>
> What is the command you are running? If the original vendor branch
> is in /vendor/foo, you copied it into /myfoo and modified it there,
> you need something like:
>
> svn diff http://URL/vendor/foo http://URL/myfoo
>
> If you instead imported and modified it within the same path (so,
> say you commit your modifications within /vendor/foo), you want
> something like:
>
> svn diff http://URL/vendor/foo@NNN http://URL/vendor/foo@HEAD
>
> where NNN is the first revision at which /vendor/foo was committed
> (find it out with svn log).
Thanks, I usually read the manual before troubling the community :)
Here it is, the problem description step by step:
$ svnadmin create /tmp/svn
$ svn mkdir file:///tmp/svn/vendor
$ svn import file:///tmp/svn/vendor/current
Adding a
Adding b
Adding b/c
Adding b/d
Adding b/d/g
Adding b/d/h
Adding b/e
Adding b/e/i
Adding b/e/j
Adding b/e/k
Adding b/f
Adding b/f/l
Adding b/f/m
$ svn cp file:///tmp/svn/vendor/current \
file:///tmp/svn/vendor/snapshot1
$ svn cp file:///tmp/svn/vendor/current \
file:///tmp/svn/trunk
$ svn rm file:///tmp/svn/trunk/b/e
$ svn diff file:///tmp/svn/vendor/snapshot1 \
file:///tmp/svn/trunk
The last 'diff' command shows no changes. However, there are some: the
copy on the trunk does not contain the files b/e/i, b/e/j, b/e/k -
they were removed as they were a part of the b/e directory. It
appears there is no way to obtain the list of such changes.
Regards,
Alexey.
--
Do not ask favors of people you routinely ambush and murder.
-- Spathi captain Fwiffo, SC2
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 31 08:43:47 2006