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

RE: SVN bug? merge replaces all files in an added directory

From: Rob Hubbard <rob.hubbard_at_softel.co.uk>
Date: Fri, 9 Oct 2009 10:34:17 +0100

Hello Peter,

Thanks very much for the reply and the ideas.

Please continue to CC me on any further replies.

> Hi Rob,
> I have experienced similar problems on a customers repository:
> It turns out that another branch had merged the directory before so
> subversion thought to replace the files and not to merge.
> I try to do some ascii art to visualize the info-flow:
> adding dir "test" into branch
> |
> v
> branch 1: ------*--->
> / \
> trunk :---------------1-----2->
> \ \ /
> branch 2: ---------*--
> |
> adding dir "test" to other branch
> (maybe merged from branch 1?)
> 1: here test will be added for the first time
> 2: here test will be replaced

I can see how the above could give rise to such similar problems. That's
not the situation I have, however. I think mine is even simpler. In your
case, the behaviour I would expect to see (if the software is working
correctly) is

        R branch2/test (from /trunk/test:1234)

whereas in my situation, I am expecting to see

        A branch/test (from /trunk/test:1234)

There is no second branch involved in my case.

> Maybe you can try to set this up as a test to see if this reproduces
> your problems..
> Also check carefully the creations of a file or directory and
> look into the repository in these particular revisions

As you suggested, I took a closer look at what's happening at the
revisions in question.

As far as I can tell, here are the key steps:

(1) a branch is created from the trunk
(2) a directory of files is moved in the trunk
(3) the trunk is merged to the branch

However, I have tried this in a test script, and I still get correct
results (i.e. no superfluous file replacements).

Unfortunately, there is a lot of activity on the repository, and the
history is quite hard to follow. It is possible I have missed something

I have also tried merging with and without the --ignore-ancestry option
(as suggested by Lakshman), but have not seen the symptoms I'm trying to
reproduce either way.

Again, it could be a problem with different versions of
server/repository/client... but I have limited time to spend
experimenting with such things. At the moment it's just a matter of
curiosity. I'd like to understand why this is happening. I expect the
SVN developers would like to know too, in order to fix any problem. This
is not stopping me getting on with my work.

If anyone has any further suggestions or ideas, I'd still be interested
to hear them.

> (TSVN repo-browser helps a lot!).

Yes I use a mixture of SVN and T-SVN, but I usually have to hunt around
more to see how to do something with the latter.

> PS:
> are you the C64-musician Rob Hubbard? if yes: Hail to the chief (just
> listening slay radio), if no: damn good name ;-)

I'm not, but this is not the first time I've been asked the question.
I preferred Acorns to Commodores anyway. :-)

Thanks again for your help (to both Peter and Lakshman).

Kind regards,

This message has been independently scanned for the Softel Group and cleared of containing viruses and other malicious data.

Powering Television Beyond the Video (TM)


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-09 11:36:02 CEST

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