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

Missed files after reintegrate

From: Silver Zachara <silver.zachara_at_gmail.com>
Date: Sun, 17 Aug 2008 10:20:16 +0200

Hi list,

I really need help. I have 2 branches now(there are more, but this isn't
crucial). First branch is trunk and second is feature branch form same
language changes. This feature branches I have created in 40 revision(I
am attaching revision graph and log for better orientation). My problem
is that I have added two files in to the trunk a button_09.gif in the 48
rev and a reset.css in the 49 rev. Now I have done two merges(in both
cases I have used "Merge a range of revision" method) and it 42-50 from
trunk to this feature branche(in this merge was above two files) and
54-61 from trunk to the feature branch at well.
In the 63 rev I have reintegrate this feature branch back to the trunk
and here is the problem. Every thing was merged without problems(some
conflicts but this I have resolved), but above two files was deleted
from trunk.(in 65 rev I have added this files back manually) (when I
have switched to the feature branch before reintegrate or to the
revision after first merge, above to files didn't there) How it's
posible ? Is this behavior normal ot it's some kind of a bug ? When I
have tested this on simple project and when I have merged revisions
where was added some files, this files was copied to the feature branch,
but in my project didn't (I have done this test on the Subversion 1.5.2
and the first merge was do on the Subversion 1.5.0 or 1.5.1 I don't know
exact, all command was input trought TortoiseSVN not from command line).

Can you explain my this ? Thank you

                      --== Silver Zachara ==--
- pgp - http://radeonvmod.ic.cz/keys/silver.zachara@gmail.com.asc -

vkol_4.png vkol_3.png
Received on 2008-08-17 10:21:03 CEST

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

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