[openbeos] Re: a few words on using svn (was: Re: a few open tickets)
- From: "Jonas Sundström" <jonas@xxxxxxxxxxx>
- To: openbeos@xxxxxxxxxxxxx
- Date: Thu, 19 Apr 2007 12:38:06 +0200 CEST
"Stefano Ceccherini" <stefano.ceccherini@xxxxxxxxx> wrote:
> 2007/4/19, Jonas Sundström <jonas@xxxxxxxxxxx>:
>
> > What if I had the latest revision, started on a patch, and someone
> > else commits to the same files before I'm able to submit the patch?
> >
> > Is there an svn command that I should use, having finished my
> > patch,
> > or is svn smart enough to attempt merging my outdated changes with
> > the later revision without any extra care on my part?
>
> Svn tells you that the file you have is not up-to-date. If you then
> run svn update, it tries to merge the changes intelligently. If it
> fails, it creates some other files, one with the most up-to-date
> revision, one with the (unsuccesfully) merged changes. And you of
> course keep your own modified version.
Thanks, Stefano.
So, I take it it's always a good idea to run svn update,
both before, after and sometimes halfway.
/Jonas Sundström.
Other related posts:
