On Wed, Apr 16, 2008 at 12:27 PM, Hyrum K. Wright
<hyrum_wright_at_mail.utexas.edu> wrote:
> Arfrever Frehtes Taifersar Arahesis wrote:
>
> > 15-04-2008 03:32 hwright_at_tigris.org <hwright_at_tigris.org> napisał(a):
> >
> > > Author: hwright
> > > Date: Mon Apr 14 18:32:57 2008
> > > New Revision: 30604
> > >
> > > Log:
> > > Merge r30597 from trunk:
> > >
> > > * r30597
> > > JavaHL: Added missing notify mapping for Replaced action.
> > > Votes:
> > > +1: markphip, hwright
> > >
> > > Modified:
> > > branches/1.5.x/STATUS
> > > branches/1.5.x/subversion/bindings/javahl/native/EnumMapper.cpp
> > >
> branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
> > >
> >
> > Why svn:mergeinfo wasn't changed?
> >
>
> That's a good question. For this (and r30602 and r30603), I just ran
> $ subversion/svn/svn merge 'https://svn.collab.net/repos/svn/trunk/
> -c30597'
>
> That should produce appropriate mergeinfo, no?
Looks like the problem lies with https vs http (!!!):
C:\SVN\1.5.x>svn info
Path: .
URL: http://svn.collab.net/repos/svn/branches/1.5.x
Repository Root: http://svn.collab.net/repos/svn
Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Revision: 30603
Node Kind: directory
Schedule: normal
Last Changed Author: hwright
Last Changed Rev: 30603
Last Changed Date: 2008-04-14 21:32:04 -0400 (Mon, 14 Apr 2008)
C:\SVN\1.5.x>svnversion
30603
C:\SVN\1.5.x>svn merge https://svn.collab.net/repos/svn/trunk/ -c30597
--- Merging r30597 into '.':
U subversion\bindings\javahl\native\EnumMapper.cpp
U subversion\bindings\javahl\src\org\tigris\subversion\javahl\NotifyAction.java
C:\SVN\1.5.x>svn st
M subversion\bindings\javahl\native\EnumMapper.cpp
M subversion\bindings\javahl\src\org\tigris\subversion\javahl\NotifyAction.java
C:\SVN\1.5.x>svn revert -R .
Reverted 'subversion\bindings\javahl\native\EnumMapper.cpp'
Reverted 'subversion\bindings\javahl\src\org\tigris\subversion\javahl\NotifyAction.java'
C:\SVN\1.5.x>svn merge http://svn.collab.net/repos/svn/trunk/ -c30597
--- Merging r30597 into '.':
U subversion\bindings\javahl\native\EnumMapper.cpp
U subversion\bindings\javahl\src\org\tigris\subversion\javahl\NotifyAction.java
C:\SVN\1.5.x>svn st
M .
M subversion\bindings\javahl\native\EnumMapper.cpp
M subversion\bindings\javahl\src\org\tigris\subversion\javahl\NotifyAction.java
M CHANGES
C:\SVN\1.5.x>svn diff --depth empty
Property changes on: .
___________________________________
Modified: svn:mergeinfo
Merged /trunk:r30597
Paul
Received on 2008-04-16 18:39:18 CEST