Hi, pretty new to darcs and my google-fu is failing me in trying to find out the answer to this conundrum.

When whatsnew says there are changes, but record (and also amend-record) disagrees, who do I believe and how do I clean it up?

   boffin@mortimer:~/gogo-jobs/XXXXXX/main$ darcs --version
   2.3.0 (release)
   boffin@mortimer:~/gogo-jobs/XXXXXX/main$ darcs whatsnew -s
   M ./course.php -2 +3
   boffin@mortimer:~/gogo-jobs/XXXXXX/main$ darcs record
   No changes!

In case it is useful, here's the actual changes in question...

   boffin@mortimer:~/gogo-jobs/XXXXXX/main$ darcs whatsnew
   hunk ./course.php 26
   -                    $t->assign("makeloginbox", "Logged in as: <b> "
   . $_SESSION['username'] . "</b><br /><a href=\"details.php\">My
   Details</a><div class=\"logbtn\"><a
   href=\"logout.php\">LOGOUT</a></div>");
   +                    $t->assign("makeloginbox", "Welcome, <b> " .
   $_SESSION['username'] . "</b> | <a href=\"details.php\">My
   Details</a><div class=\"logbtn\"><a
   href=\"logout.php\">LOGOUT</a></div>");
   hunk ./course.php 30
   -                                       $t->assign("makeloginbox",
   "[Not logged in]<div class=\"logbtn\"><a
   href=\"login.php\">LOGIN</a></div>");
   +                                       $t->assign("makeloginbox",
   "You are not logged in.<div class=\"logbtn\"><a
   href=\"login.php\">LOGIN</a></div>");
   hunk ./course.php 260
   +

Thanks in advance.
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to