db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jean T. Anderson" <...@bristowhill.com>
Subject Re: DERBY-1057 : patch Derby1057_ref4.diff and a "G" svn status
Date Tue, 15 Aug 2006 20:57:22 GMT
Actually, it must have been the second 'svn up' that reported the "G"
because an 'svn status' now shows "M". Since the doc build succeeds,
I'll commit this.

sorry for the noisy confusion,

 -jean

Jean T. Anderson wrote:
> Applying derby1057_ref4.diff gets
> 
>    Reversed (or previously applied) patch detected!  Assume -R?
> 
> so I did this trick:
> 
>    svn up -r 431389
>    patch -p0 -i derby1057_ref4.diff
>    svn up
> 
> 'svn status' shows everything looks good except for the ditamap file:
> 
>    G  src/ref/refderby.ditamap
> 
> I'm looking for info about that "G" status and am not finding it at
> http://svnbook.red-bean.com/en/1.0/re26.html , but I vaguely recall from
> other ASF projects that it means something about local modifications
> colliding with what is checked into the server.
> 
> The doc build succeeds. Is it "safe" to just go ahead and commit this?
> 
> thanks,
> 
>  -jean


Mime
View raw message