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

RE: Problems Merging

From: Stephen Hansen <shansen_at_advpubtech.com>
Date: 2004-05-10 23:49:11 CEST

*blink* That's complicated.

I made this initial branch at r185. So:


cd trunk/Python
svn merge -r 185:HEAD
A DLLs/_omnicodesets.pyd
A DLLs/_omnipy.pyd
G pywin32.pth
D Lib/site-packages/apt/test/corba/Naming.py
D Lib/site-packages/apt/test/corba/server.ref
D Lib/site-packages/apt/test/corba/Editorial.idl
D Lib/site-packages/apt/test/corba/Client.py
D Lib/site-packages/apt/test/corba/Mother.py
D Lib/site-packages/apt/test/corba/test.py
D Lib/site-packages/apt/test/corba/__init__.py
D Lib/site-packages/apt/test/corba/FalconLayout.idl
D Lib/site-packages/apt/test/corba/Editorial_skel/__init__.py
D Lib/site-packages/apt/test/corba/Editorial_skel
D Lib/site-packages/apt/test/corba/Editorial/__init__.py
D Lib/site-packages/apt/test/corba/Editorial
D Lib/site-packages/apt/test/corba
D Lib/site-packages/apt/test/corba
C Lib/site-packages/apt/system/editorial/application/editpag/EditPag.py
G Lib/site-packages/apt/system/editorial/application/client/App.py
Skipped missing target:
Skipped missing target:
G Lib/site-packages/apt/library/dialogs/LoginDialog.py
svn: Working copy 'Lib/site-packages/apt/library/interfaces' not locked


So, still missing targets and working copy locks, neither of which error
message mean anything useful to me. The 'skipped missing targets' there
are actually files which are in the branch that are supposed to be added
into the trunk. And the working copy not locked error is a directory
with files in it that are 'new'...

Confusedly yours :)


> -----Original Message-----
> From: Ben Collins-Sussman [mailto:sussman@collab.net]
> Sent: Monday, May 10, 2004 2:17 PM
> To: Stephen Hansen
> Cc: users@subversion.tigris.org
> Subject: Re: Problems Merging
> On Mon, 2004-05-10 at 16:10, Stephen Hansen wrote:
> > Hi all.
> >
> > I'm a fairly new user to Subversion and have been using
> it on new
> > projects around the office, and have run into a bit of a
> problem with
> > merging. I branched /trunk/Python into /branch/omniorb
> awhile back to
> > do some extensive work, and now would like to merge my changes back
> > into the trunk. So, I do:
> >
> > svn merge
> >
> You're making the "classic" mistake trying to compare the
> trunk with the branch. Go read this section of the book:
> http://svnbook.red-bean.com/svnbook/ch04s04.html#svn-ch-4-sect-4.1

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 10 23:50:19 2004

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.