diff tests/test-mq.out @ 10190:9c2c94934f0d

mq: upgrade to git patch when necessary (issue767)
author Patrick Mezard <pmezard@gmail.com>
date Fri, 01 Jan 2010 21:21:34 +0100
parents fa7170d6529f
children bcf90e712dc3
line wrap: on
line diff
--- a/tests/test-mq.out	Fri Jan 01 20:54:05 2010 +0100
+++ b/tests/test-mq.out	Fri Jan 01 21:21:34 2010 +0100
@@ -21,6 +21,18 @@
   remove patch from applied stack           qpop
   refresh contents of top applied patch     qrefresh
 
+By default, mq will automatically use git patches when required to avoid
+losing file mode changes, copy records, binary files or empty files creations
+or deletions. This behaviour can be configured with:
+
+  [mq]
+  git = auto/keep/yes/no
+
+If set to 'keep', mq will obey the [diff] section configuration while
+preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq
+will override the [diff] section and always generate git or regular patches,
+possibly losing data in the second case.
+
 list of commands:
 
  qapplied     print the patches already applied