===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/translation-explained.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** www/Attic/translation-explained.html	2005/07/02 00:35:25	1.8
--- www/Attic/translation-explained.html	2005/07/12 20:51:57	1.9
***************
*** 513,524 ****
  
  <a name="revert"></a>
  <h4>Reverting a change</h4>
! If you have committed a file in a wrong directory, or which has
! problems, you have to revert the commit as soon as possible. To do
! such thing with <i>badfile</i>, you can do:
  
  <pre>
!    $ cvs log badfile
  </pre>
  
  <p>
--- 513,525 ----
  
  <a name="revert"></a>
  <h4>Reverting a change</h4>
! If you have committed a file and you discover that your commit breaks
! something, you have to revert the commit as soon as possible. Assume the
! problem lays in a file called <i>somefile</i>. Follow the procedure
! below to revert it to an unbroken revision:
  
  <pre>
!    $ cvs log somefile
  </pre>
  
  <p>
***************
*** 527,544 ****
  checkout the previous revision and commit it to fix the issue.
  
  <pre>
!    $ rm badfile
!    $ cvs co -r1.191 badfile
  </pre>
  
  <p>
! <i>1.191</i> is just the previous revision before <i>1.192</i>. Now, you
! have it in your working copy and you can commit to restore things.
  
  <pre>
!    $ cvs commit -m "restoring previous version" badfile
  </pre>
  
  <h3><font color="#0000e0"><a name="Guidelines">Translation
      Guidelines</a></font></h3>
  
--- 528,565 ----
  checkout the previous revision and commit it to fix the issue.
  
  <pre>
!    $ cvs update -A somefile
!    $ rm somefile
!    $ cvs update -p -r1.191 somefile > somefile
  </pre>
  
  <p>
! <i>1.191</i> is indeed the previous revision. It is now in your working
! copy. You should commit it to restore the file to a working state:
  
  <pre>
!    $ cvs commit -m "restoring previous version" somefile
  </pre>
  
+ <a name="wrongdir"></a>
+ <h4>Committing in a bad directory</h4>
+ If you have committed a file in a bad directory, you have to fix things
+ by moving it to the right directory as soon as possible. Assume you have
+ committed <i>somefile</i> to <i>baddir</i> while it should really go
+ into <i>gooddir</i>. Here is the procedure to correct your mistake:
+ 
+ <pre>
+    $ pwd
+    ...devel/openbsd/steelix-www/.../baddir
+    $ cvs remove somefile
+    $ mv somefile path/to/gooddir
+    $ cd path/to/gooddir
+    $ pwd
+    ...devel/openbsd/steelix-www/.../gooddir
+    $ cvs add somefile
+    $ cvs commit -m "move file to the right location" somefile
+ </pre>
+ 
  <h3><font color="#0000e0"><a name="Guidelines">Translation
      Guidelines</a></font></h3>
  
***************
*** 785,791 ****
  <a href="mailto:www@openbsd.org">www@openbsd.org</a>
  <br>
  <small>
! $OpenBSD: translation-explained.html,v 1.8 2005/07/02 00:35:25 saad Exp $
  </small>
  
  </body>
--- 806,812 ----
  <a href="mailto:www@openbsd.org">www@openbsd.org</a>
  <br>
  <small>
! $OpenBSD: translation-explained.html,v 1.9 2005/07/12 20:51:57 saad Exp $
  </small>
  
  </body>