[haiku-commits] Re: r41130 - haiku/trunk/src/add-ons/kernel/bus_managers/ps2

  • From: "Axel Dörfler" <axeld@xxxxxxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 28 Mar 2011 10:31:11 +0200 (MEST)

> > Log:
> > Delete old c files.
> That sounds like you lost the history on those files! The idea is to use
> "svn mv" which not only renames the files (to .cpp), but also preserves the
> history (and also would make the rename a single commit). If you did not use
> "svn cp" to create the cpp files, please revert your changes, and do it
> again to restore the history of the C files.

Just to make that clear: it doesn't help to manually revert the changes, that 
doesn't bring the history back (it still seems to be gone when looking at the 
revision log) -- how could svn otherwise know that you reverted anything?
You have to use svn to revert your changes back to the original revision using 
svn merge.
For example, see 
http://svnbook.red-bean.com/en/1.4/svn-book.html#svn.branchmerge.commonuses.undo
 (that's what Google returned, I guess the same paragraph can be found in a 
more recent version of the docs).

Bye,
   Axel.


Other related posts: