Use pass --pull to bzr merge to avoid needing to commit merged changes. Closes: ...

[code/myrepos.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 8ed25d2a24b431692f203c7ca94592ae2c284868..8764a34a59c2c5fbea9d9ba59a473cd28d967866 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,86 @@
-mr (0.30) UNRELEASED; urgency=low
+mr (0.40) UNRELEASED; urgency=low
+
+  * Use pass --pull to bzr merge to avoid needing to commit
+    merged changes. Closes: #524352
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 16 Apr 2009 13:11:53 -0400
+
+mr (0.39) unstable; urgency=low
+
+  * Determine current branch for fake-bare update (martin f. krafft)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 09 Mar 2009 22:50:54 -0400
+
+mr (0.38) unstable; urgency=low
+
+  * Remove gitless lib. It turned out to be better to simply
+    use git clone --shared when checking out. Sorry for the churn..
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 22 Jan 2009 15:39:33 -0500
+
+mr (0.37) unstable; urgency=low
+
+  * Add "gitless" file to lib. 
+    This adds a special type of git repository, where the .git directory
+    is stored on a file server, to avoid wasting space with it on the client.
+  * Revert buggy change to directory printing code.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 21 Jan 2009 01:40:59 -0500
+
+mr (0.36) unstable; urgency=low
+
+  * Add webcheckout command. See <http://kitenet.net/~joey/rfc/rel-vcs/>
+  * Fix display of repos configured at absolute path locations.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 10 Jan 2009 16:42:07 -0500
+
+mr (0.35) unstable; urgency=low
+
+  * Warn if an include command fails nonzero. Closes: #495306
+  * Remove stray character in pod that uglified man page. Closes: #495731
+  * Create ~/.mrlog not world readable.
+  * Pass additional options to darcs push when pushing. Closes: #495734
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 16 Oct 2008 14:51:00 -0400
+
+mr (0.34) unstable; urgency=low
+
+  * Fix bug when remembering failed commands in offline mode.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 02 Aug 2008 12:27:21 -0400
+
+mr (0.33) unstable; urgency=low
+
+  * Add a push subcommand, which pushes committed changes for DCVS, and 
+    does nothing for svn/cvs. Closes: #491865
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 22 Jul 2008 15:22:01 -0400
+
+mr (0.32) unstable; urgency=low
+
+  * Include the right (v2) version of GPL in the source.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 22 Jul 2008 00:28:55 -0400
+
+mr (0.31) unstable; urgency=low
+
+  * Add an offline mode. When in offline mode, mr will remember commands
+    that failed (presumably due to lack of network access), and will run
+    them again once back online. (This is for all the laptop users
+    like me who don't want to have to remember which git repos to mr push
+    when they come back from a nice long hack in the woods. :-)
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 27 Jun 2008 23:19:23 -0400
+
+mr (0.30) unstable; urgency=low
 
   [ martin f. krafft ]
   * Several git-fake-bare improvements.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 18 May 2008 17:41:53 -0400
+  [ Joey Hess ]
+  * Fix mr -c <config> register. (Thanks, Daniel Bungert)
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 25 Jun 2008 13:38:31 -0400
 
 mr (0.29) unstable; urgency=low