You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com> on 2008/04/16 15:16:14 UTC
Re: svn commit: r30604 - in branches/1.5.x: . subversion/bindings/javahl/native subversion/bindings/javahl/src/org/tigris/subversion/javahl
15-04-2008 03:32 hwright@tigris.org <hw...@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?
>
> Modified: branches/1.5.x/STATUS
> URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/STATUS?pathrev=30604&r1=30603&r2=30604
> ==============================================================================
> --- branches/1.5.x/STATUS Mon Apr 14 18:32:04 2008 (r30603)
> +++ branches/1.5.x/STATUS Mon Apr 14 18:32:57 2008 (r30604)
> @@ -29,9 +29,3 @@ Candidate changes:
>
> Approved changes (all releases):
> ================================
> -
> - * r30597
> - JavaHL: Added missing notify mapping for Replaced action.
> - Votes:
> - +1: markphip, hwright
> -
>
> Modified: branches/1.5.x/subversion/bindings/javahl/native/EnumMapper.cpp
> URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/subversion/bindings/javahl/native/EnumMapper.cpp?pathrev=30604&r1=30603&r2=30604
> ==============================================================================
> --- branches/1.5.x/subversion/bindings/javahl/native/EnumMapper.cpp Mon Apr 14 18:32:04 2008 (r30603)
> +++ branches/1.5.x/subversion/bindings/javahl/native/EnumMapper.cpp Mon Apr 14 18:32:57 2008 (r30604)
> @@ -158,6 +158,10 @@ jint EnumMapper::mapNotifyAction(svn_wc_
> /* Got an add in an update. */
> return org_tigris_subversion_javahl_NotifyAction_update_add;
>
> + case svn_wc_notify_update_replace:
> + /* Got a replaced in an update. */
> + return org_tigris_subversion_javahl_NotifyAction_update_replaced;
> +
> case svn_wc_notify_update_update:
> /* Got any other action in an update. */
> return org_tigris_subversion_javahl_NotifyAction_update_update;
>
> Modified: branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
> URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java?pathrev=30604&r1=30603&r2=30604
> ==============================================================================
> --- branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java Mon Apr 14 18:32:04 2008 (r30603)
> +++ branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java Mon Apr 14 18:32:57 2008 (r30604)
> @@ -140,6 +140,12 @@ public interface NotifyAction
> public static final int merge_begin = 28;
>
> /**
> + * @since 1.5
> + * Got a replaced in an update.
> + */
> + public static final int update_replaced = 29;
> +
> + /**
> * textual representation of the action types
> */
> public static final String[] actionNames =
> @@ -173,5 +179,6 @@ public interface NotifyAction
> "changelist set",
> "changelist cleared",
> "merge begin",
> + "replaced"
> };
> }
>
Re: svn commit: r30604 - in branches/1.5.x: . subversion/bindings/javahl/native
subversion/bindings/javahl/src/org/tigris/subversion/javahl
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
C. Michael Pilato wrote:
> Hyrum K. Wright wrote:
>> Arfrever Frehtes Taifersar Arahesis wrote:
>>> 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?
>
> As typed, I'd say it'd produce an error. (You've got quotes around both
> the URL and the -c option.) But I'll assume that's a typo, since your
> merge clearly did real work.
Yeah, that's a typo.
Re: svn commit: r30604 - in branches/1.5.x: . subversion/bindings/javahl/native
subversion/bindings/javahl/src/org/tigris/subversion/javahl
Posted by "C. Michael Pilato" <cm...@collab.net>.
Hyrum K. Wright wrote:
> Arfrever Frehtes Taifersar Arahesis wrote:
>> 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?
As typed, I'd say it'd produce an error. (You've got quotes around both the
URL and the -c option.) But I'll assume that's a typo, since your merge
clearly did real work.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: svn commit: r30604 - in branches/1.5.x: . subversion/bindings/javahl/native
subversion/bindings/javahl/src/org/tigris/subversion/javahl
Posted by "C. Michael Pilato" <cm...@collab.net>.
Paul Burba wrote:
> On Wed, Apr 16, 2008 at 12:27 PM, Hyrum K. Wright
> <hy...@mail.utexas.edu> wrote:
>> Arfrever Frehtes Taifersar Arahesis wrote:
>>
>>> 15-04-2008 03:32 hwright@tigris.org <hw...@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 (!!!):
Yay! A successful(ish) foreign repository merge!
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: svn commit: r30604 - in branches/1.5.x: . subversion/bindings/javahl/native subversion/bindings/javahl/src/org/tigris/subversion/javahl
Posted by Paul Burba <pt...@gmail.com>.
On Wed, Apr 16, 2008 at 12:27 PM, Hyrum K. Wright
<hy...@mail.utexas.edu> wrote:
> Arfrever Frehtes Taifersar Arahesis wrote:
>
> > 15-04-2008 03:32 hwright@tigris.org <hw...@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
Re: svn commit: r30604 - in branches/1.5.x: . subversion/bindings/javahl/native
subversion/bindings/javahl/src/org/tigris/subversion/javahl
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Arfrever Frehtes Taifersar Arahesis wrote:
> 15-04-2008 03:32 hwright@tigris.org <hw...@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?
-Hyrum