Merge with crew-stable
authorMartin Geisler <mg@lazybytes.net>
Thu, 10 Sep 2009 10:31:12 +0200
changeset 9435 aa92ce9586d8
parent 9432 fef209e65757 (current diff)
parent 9434 f5ce9b052747 (diff)
child 9436 96379c93ba6f
Merge with crew-stable
hgext/transplant.py
--- a/hgext/transplant.py	Sun Sep 06 15:32:16 2009 +0200
+++ b/hgext/transplant.py	Thu Sep 10 10:31:12 2009 +0200
@@ -182,7 +182,7 @@
         fp.write("# HG changeset patch\n")
         fp.write("# User %s\n" % user)
         fp.write("# Date %d %d\n" % date)
-        fp.write(changelog[4])
+        fp.write(msg + '\n')
         fp.close()
 
         try:
--- a/tests/test-convert-git	Sun Sep 06 15:32:16 2009 +0200
+++ b/tests/test-convert-git	Thu Sep 10 10:31:12 2009 +0200
@@ -42,7 +42,7 @@
 echo b >> a
 commit -a -m t4.1
 
-git checkout -b other HEAD^ >/dev/null 2>/dev/null
+git checkout -b other HEAD~ >/dev/null 2>/dev/null
 echo c > a
 echo a >> a
 commit -a -m t4.2
@@ -68,7 +68,7 @@
 echo >> foo
 commit -a -m 'change foo'
 
-git checkout -b Bar HEAD^ >/dev/null 2>/dev/null
+git checkout -b Bar HEAD~ >/dev/null 2>/dev/null
 echo quux >> quux
 git add quux
 commit -a -m 'add quux'
@@ -77,7 +77,7 @@
 git add bar
 commit -a -m 'add bar'
 
-git checkout -b Baz HEAD^ >/dev/null 2>/dev/null
+git checkout -b Baz HEAD~ >/dev/null 2>/dev/null
 echo baz > baz
 git add baz
 commit -a -m 'add baz'
@@ -89,7 +89,7 @@
 echo bar >> bar
 commit -a -m 'change bar'
 
-git checkout -b Foo HEAD^ >/dev/null 2>/dev/null
+git checkout -b Foo HEAD~ >/dev/null 2>/dev/null
 echo >> foo
 commit -a -m 'change foo'