[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 11:42:16 +0200 CEST
"Niels Reedijk" <niels.reedijk@xxxxxxxxx> wrote:
> 2007/4/18, Jonas Sundström <jonas@xxxxxxxxxxx>:
> > Tim de Jong <tjadejong@xxxxxxxxxxx> wrote:
> > 'svn diff' will print the difference between your files and what's
> > on the server. To create a patch to upload to the bug tracker,
> > cd to the parent folder of the file(s) you've edited, and run
> > svn diff > /somewhere/my_changes.diff
>
> That´s not true. svn diff prints the differences between your files
> and the revision you have checked out. svn makes a copy of the
> original it gets from the server in the ´.svn´ directory. Thus,
> before
> making patches that you want to submit, please do a svn update first
> to make sure you have the latest revision on your hard drive.
Thanks, Niels. :)
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?
/Jonas Sundström.
Other related posts:
