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

merge deleting common files

From: Richard Jones <richard.d.jones_at_imperial.ac.uk>
Date: 2006-07-21 13:07:36 CEST

Hi Folks,

Apologies for this potentially newbie questions, but I've been
scratching my head over this problem for a couple of days, and have no
idea where I'm going wrong.

I am attempting to merge a feature branch back to a main branch in my
repository, and it is, for some unknown reason, deleting files which are
present in both branches, thus:

$ svn merge https://[repository]/branches/spiral-bib_item-status

D config/registries/spiral-bib-dc-types.xml
A config/registries/spiral-bib-dc-types.xml
D src/uk/ac/ic/dspace/administer/MetadataImporter.java
D src/uk/ac/ic/dspace/administer/RegistryImportException.java
D src/uk/ac/ic/dspace/administer/SchemaImporter.java
D src/uk/ac/ic/dspace/administer/RegistryImporter.java
D src/uk/ac/ic/dspace/administer
D src/uk/ac/ic/dspace
D src/uk/ac/ic
D src/uk/ac
D src/uk
svn: Revision 50 doesn't match existing revision 31 in 'src/uk'

I have been merging up from the main branch (spiral-bib) to the feature
branch (spiral-bib_item-status) periodically, and revision 31 of the
main branch has recently been merged upward to the feature branch. Now,
I want to merge the feature branch changes back down. I am executing
this command in the working copy of the main branch.

Perhaps I have misunderstood the merge documentation, but I have tried
so many variations, with such similar results. If anyone has any idea
what I'm doing wrong, and can set me back on the conceptual
straight-and-narrow that would be a great help. Let me know if you need
any more information.

All the best,

Richard Jones
Web and Database Technology Specialist
Imperial College London
t: +44 (0)20 759 41815
e: richard.d.jones@imperial.ac.uk
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 21 13:09:46 2006

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.