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

Merging question

From: Francois Beausoleil <fbos_at_users.sourceforge.net>
Date: 2003-06-26 18:04:27 CEST

Hello everyone,

Here's the line I executed:
E:\harry>svn merge --dry-run file:///repos/trunk_at_12
file:///repos/trunk_at_HEAD
   src\java\core\net\sourceforge\jgb\builder\Builder.java

I expected SVN to tell me the file would be updated. So, why didn't it
tell me so ? Here's the history of the file:
* Created in rev 7
* Updated in rev 13
* Branch created from rev 12 in rev 16 (svn copy -r 12 file:///.../trunk
file:///.../branches/X/)
* Renamed to DefaultBuilder, moved to impl/ in rev 17 and updated in
branch X

So, in the branch I am working in right now, the file does not exist
anymore. So, what I believe I could/should do then is to:
1. Update the branch WC to the revision just before the copy (16)
2. Apply the merge like what I said on top
3. Update again to HEAD of branch, keeping local mods
4. Compile, test and commit

Trying that now... And it almost works. Step #3 lost my local mods. Is
what I am trying to do even supported ?

Versions are Win 2K SP3 over ra_local and SVN:
svn, version 0.24.2 (r6284)
   compiled Jun 19 2003, 05:44:59

Thanks !
Franšois

--
  Francois Beausoleil
  Developer of Java Gui Builder
  http://jgb.sourceforge.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 26 18:05:27 2003

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

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