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

RE: Merging and Additions

From: Michael Pickard <mpickard_at_visitlondon.com>
Date: 2006-05-24 10:38:44 CEST

Sorry Garrett, perhaps I wasn't very clear.
What I meant was merge changes from trunk (A) into the working directory
of Branch (B). Same repository.

(See Ryan Schmidt's earlier answer, which seems to work)

-----Original Message-----
From: rooneg@gmail.com [mailto:rooneg@gmail.com] On Behalf Of Garrett
Sent: 23 May 2006 19:47
To: Michael Pickard
Cc: users@subversion.tigris.org
Subject: Re: Merging and Additions

Correct, because 'svn merge' has never been documented to work with
two separate repositories. It just doesn't work. In newer versions
of svn it'll error out loudly if you try. In older versions it'll
sometimes kinda sorta work, and sometimes you get this kind of error.

Michael Pickard
Software Engineer
Visit London
6th Floor,
2 More London Riverside, London, SE1 2RR
Tel: +44 (0)20 7234 5857
Fax: +44 (0)20 7234 5751
Visit London is the official visitor organisation for London. Visit London is partly funded by Partnership, the Mayor's London Development Agency and the Association of London Government.
The information contained in this e-mail is confidential and intended for the named recipient(s) only. If you have received it in error, please notify the sender immediately and then delete the message. If you are not the intended recipient, you must not use, disclose, copy or distribute this email. The views expressed in this e-mail are those of the individual and not of Visit London. We reserve the right to read and monitor any email or attachment entering or leaving our systems without prior notice.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 24 10:37:12 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.