commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebb <seb...@gmail.com>
Subject Re: svn commit: r1579340 - in /commons/proper/proxy: branches/version-2.0-work/ trunk/
Date Thu, 20 Mar 2014 11:21:41 GMT
On 20 March 2014 07:21, Benedikt Ritter <britter@apache.org> wrote:
> 2014-03-20 0:59 GMT+01:00 sebb <sebbaz@gmail.com>:
>
>> On 19 March 2014 21:57, Matt Benson <gudnabrsam@gmail.com> wrote:
>> > It's not really lost, is it? It can easily be restored. When I do so,
>> > will you withdraw your -1?
>>
>> It so happens that the doap is referenced by projects.a.o so it is
>> obvious when it disappears from its original SVN location.
>>
>> I have no idea whether anything else has gone missing from trunk, so
>> it's impossible to say whether restoring the doap is suffiicient, or
>> whether other useful/essential files are no longer present in trunk.
>>
>> Sorry but at present I cannot withdraw my -1.
>>
>
> I don't have much experience when it comes to merging in SVN. I try to
> avoid it when ever possible. In this case, the merge seems to cause
> problems.

Was it a merge?
The commit added trunk as a copy of a branch.
I assume trunk must have been previously deleted or renamed, but I did
not have time to scan back to find out what happened.

[Later]

I have now found the rename sequence:

$ svn log -v -l 2 http://svn.apache.org/repos/asf/commons/proper/proxy@1579340
------------------------------------------------------------------------
r1579340 | mbenson | 2014-03-19 18:30:46 +0000 (Wed, 19 Mar 2014) | 1 line
Changed paths:
   D /commons/proper/proxy/branches/version-2.0-work
   A /commons/proper/proxy/trunk (from
/commons/proper/proxy/branches/version-2.0-work:1579339)

make 2.0 branch into trunk
------------------------------------------------------------------------
r1579339 | mbenson | 2014-03-19 18:30:09 +0000 (Wed, 19 Mar 2014) | 1 line
Changed paths:
   A /commons/proper/proxy/branches/1.x (from
/commons/proper/proxy/trunk:1579338)
   D /commons/proper/proxy/trunk

move proxy trunk to 1.x branch
------------------------------------------------------------------------

I could not find it before because it does not appear in the history
for /trunk, AFAICT.

> Sebb: do you have a suggestion how to get this right?

AFAIK the flip of trunk and branch *has* to be done as two unrelated
SVN commits.

This is a relatively unusual SVN occurrence so IMO it's worth being
more explicit in the commit log messages so each can be understood on
its own.

Yes, it's possible to find this out by using SVN log, but it would
certainly have made it easier for me to understand the r1579340 commit
message if the log had mentioned that trunk was renamed to 1.x branch
in r1579339.
It would also have been useful to note why trunk was being renamed in
the r1579339 log message.

==

Given what I have now found out - i.e. trunk files are now in the 1.x
branch - then if the branch is missing any further files (e.g.
license-header.txt is in old trunk but not new trunk) then these files
can be recovered (as was done for the doap).

So I withdraw my -1.

> Regards,
> Benedikt
>
>
>>
>>
>> > Matt
>> >
>> > On Wed, Mar 19, 2014 at 4:44 PM, sebb <sebbaz@gmail.com> wrote:
>> >> On 19 March 2014 18:30,  <mbenson@apache.org> wrote:
>> >>> Author: mbenson
>> >>> Date: Wed Mar 19 18:30:46 2014
>> >>> New Revision: 1579340
>> >>>
>> >>> URL: http://svn.apache.org/r1579340
>> >>> Log:
>> >>> make 2.0 branch into trunk
>> >>>
>> >>> Added:
>> >>>     commons/proper/proxy/trunk/
>> >>>       - copied from r1579339,
>> commons/proper/proxy/branches/version-2.0-work/
>> >>> Removed:
>> >>>     commons/proper/proxy/branches/version-2.0-work/
>> >>>
>> >>
>> >> -1
>> >>
>> >> This has lost at least one important file, i.e. the DOAP.
>> >>
>> >> I've not checked to see if there were any other casualties.
>> >>
>> >> ---------------------------------------------------------------------
>> >> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
>> >> For additional commands, e-mail: dev-help@commons.apache.org
>> >>
>> >
>> > ---------------------------------------------------------------------
>> > To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
>> > For additional commands, e-mail: dev-help@commons.apache.org
>> >
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
>> For additional commands, e-mail: dev-help@commons.apache.org
>>
>>
>
>
> --
> http://people.apache.org/~britter/
> http://www.systemoutprintln.de/
> http://twitter.com/BenediktRitter
> http://github.com/britter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message