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

svn merge with revision argument "committed"

From: <Fabien.Bouleau_at_ses-astra.com>
Date: 2006-05-24 12:54:55 CEST

Hello everybody,

I am using the following:

* svn, version 1.2.3 (r15833) compiled Aug 26 2005, 03:42:45
* Linux fboulepc 2.6.15-1.1833_FC4smp #1 SMP Wed Mar 1 23:56:51 EST 2006
i686 i686 i386 GNU/Linux

In my repository, I work with proj/trunk (stable) and
proj/branches/proj_dev (development). The respective sandboxes are
l~/Projects/proj and ~/Projects/proj_dev.

Now when I want to merge the latest modifications to the trunk, I type:

  [fboule@fboulepc proj]$ cd ~/Projects/proj
  [fboule@fboulepc proj]$ svn merge -r committed:head ../proj_dev .

However, it doesn't work as expected (as I would expect I should maybe

An example hereafter:

  [fboule@fboulepc proj]$ svn update
  At revision 247.
  [fboule@fboulepc proj]$ svn info
  Path: .
  URL: file:///home/svn/WEB/proj/trunk
  Repository UUID: 3dc7c77c-889d-2f49-9d6b-63af54285b16
  Revision: 247
  Node Kind: directory
  Schedule: normal
  Last Changed Author: fboule
  Last Changed Rev: 243
  Last Changed Date: 2006-05-23 11:42:06 +0000 (Tue, 23 May 2006)

And now:

  [fboule@fboulepc proj]$ svn merge --dry-run -r COMMITTED:HEAD
../proj_dev/ .
  [fboule@fboulepc proj]$

I would expect the following:

  [fboule@fboulepc proj]$ svn merge --dry-run -r 243:HEAD ../proj_dev/ .
  U fndisplay.php
  U frmmain.php
  U changelog.txt
  U frmtemplate_part1.php

Am I doing something wrong?

Best Regards,

This e-mail contains proprietary information some or all of which may be
legally privileged. It is for the intended recipient only. If an addressing
or transmission error has misdirected this e-mail, please notify the author
by replying to this e-mail. If you are not the intended recipient you must
not use, disclose, distribute, copy, print, or rely on this e-mail.
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 24 12:54:33 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.