Re: [PATCH] Improve support for svn_checksum.h in SWIG bindings for python

On Wed, Feb 20, 2013 at 4:31 AM, Ben Reser <ben_at_reser.org> wrote:

> On Tue, Feb 19, 2013 at 2:33 PM, Shivani Poddar
> <shivani.poddar92_at_gmail.com> wrote:
> > I see. I did run an 'svn update' on my working copy before making any new
> > changed this time around.
> > Maybe i'll recheck the diff yes.
>
> If Subversion can apply the changes (or at least thinks it can)
> without creating a conflict it will do so. When this happens you'll
> see a G instead of a U next to the filename during the update.
>
> In your case I'm pretty sure you had the file as you'd last submitted
> in your local checkout. We added the file and then made changes. You
> ran `svn update` and your changed merged with ours. Thus resulting in
> the changes you didn't want.
>

Yes, true, I think running a `svn revert` as indicated in #svn irc channel
seems good for now.
Received on 2013-02-20 00:12:01 CET