<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
</head>
<body text="#000000" bgcolor="#ffffff">
Hi, pretty new to darcs and my google-fu is failing me in trying to
find out the answer to this conundrum.<br>
<br>
When whatsnew says there are changes, but record (and also
amend-record) disagrees, who do I believe and how do I clean it up?<br>
<br>
<blockquote><tt>boffin@mortimer:~/gogo-jobs/XXXXXX/main$ darcs
--version<br>
2.3.0 (release)<br>
boffin@mortimer:~/gogo-jobs/XXXXXX/main$ darcs whatsnew -s<br>
M ./course.php -2 +3<br>
boffin@mortimer:~/gogo-jobs/XXXXXX/main$ darcs record<br>
No changes!<br>
<br>
</tt></blockquote>
In case it is useful, here's the actual changes in question...<br>
<br>
<blockquote><tt>boffin@mortimer:~/gogo-jobs/XXXXXX/main$ darcs
whatsnew <br>
hunk ./course.php 26<br>
- $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>");<br>
+ $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>");<br>
hunk ./course.php 30<br>
-
$t->assign("makeloginbox", "[Not logged in]<div
class=\"logbtn\"><a
href=\"login.php\">LOGIN</a></div>");<br>
+
$t->assign("makeloginbox", "You are not logged in.<div
class=\"logbtn\"><a
href=\"login.php\">LOGIN</a></div>");<br>
hunk ./course.php 260<br>
+<br>
</tt></blockquote>
Thanks in advance.<br>
</body>
</html>