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

RE: Notifications missing items with 'svn merge'

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 18 Dec 2008 22:52:41 +0000

On Thu, 2008-12-18 at 11:08 +0100, Bert Huijben wrote:
> > -----Original Message-----
> > From: Hyrum K. Wright [mailto:hyrum_wright_at_mail.utexas.edu]
> > Sent: woensdag 17 december 2008 16:14
> > To: dev_at_subversion.tigris.org
> > Subject: Notifications missing items with 'svn merge'
> >
> > Just a minute ago, I tried to bring the 1.5.x-build-fixes branch up-to-
> > date with
> > the 1.5.x branch (to pull in the fixes to merge test 106). Using a
> > trunk
> > build from this morning (r34764), I observed the following:
> >
> > hwright_at_spock:~/dev/svn-1.5.x-2$ svnd merge ^/branches/1.5.x
> > --- Merging r34739 through r34764 into '.':
> > U STATUS
> > hwright_at_spock:~/dev/svn-1.5.x-2$

Hyrum,

I couldn't reproduce this. I used a build of svn /trunk_at_34764, in a WC
of /branches/1.5.x-build-fixes_at_34764:
[[[
$ ~/src/subversion-trunk2/bin/svn merge -r34738:34764 ^/branches/1.5.x
--- Merging r34739 through r34764 into '.':
U STATUS
U subversion/tests/cmdline/merge_tests.py
]]]

- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=987020
Received on 2008-12-18 23:48:01 CET

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