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

Merge Question

From: Brian Erickson <erickson_at_BAUERCONTROLS.com>
Date: Thu, 5 Jun 2008 10:30:26 -0400

Hi all,
I have a working copy (checked out from a branch). The branch was
created from the trunk at revision 730.
Here is the info from the working copy...

        pcs4.2.10.0 I:\pcs\workstation\server>svn info
        Path: .
        Repository Root: http://snidely/svn/pcs
        Repository UUID: ac9423d5-b5e3-b84e-aea3-6091112c9e7f
        Revision: 747
        Node Kind: directory
        Schedule: normal
        Last Changed Author: gourlay
        Last Changed Rev: 727
        Last Changed Date: 2008-05-07 13:36:20 -0400 (Wed, 07 May 2008)

Attempt #1 to merge in a change (notice no output)

        pcs4.2.10.0 I:\pcs\workstation\server>svn merge --revision
766:767 --dry-run http://snidely/svn/pcs/trunk \

Attempt #2 to merge in a change (notice this one got the one file that

        pcs4.2.10.0 I:\pcs\workstation\server>svn merge --change 766
--dry-run http://sn <http://snidely/svn/pcs/trunk> idely/svn/pcs/trunk \
        U \pcs\workstation\server\filterfile.c

I thought I understood from the docs that the two forms above were
equivalent but I must be missing something. Can anyone shed any light
on the situation?
My info:
Windows XP Pro Service pack 3
Subverion 1.4.6
Using Apache to access the repository.
Received on 2008-06-05 16:30:56 CEST

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.