# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1186429997 25200
# Node ID c9126c24e0988ca0445bd4e0744d2c0e2f5eb470
# Parent  90be02035993e6f35a0f6f9ddbede55df0903b4e
record: work properly if invoked in a subdirectory

diff -r 90be02035993 -r c9126c24e098 hgext/record.py
--- a/hgext/record.py	Mon Aug 06 20:31:15 2007 +0200
+++ b/hgext/record.py	Mon Aug 06 12:53:17 2007 -0700
@@ -363,7 +363,7 @@
             try:
                 for realname, tmpname in backups.iteritems():
                     ui.debug('restoring %r to %r\n' % (tmpname, realname))
-                    util.copyfile(tmpname, realname)
+                    util.copyfile(tmpname, repo.wjoin(realname))
                     os.unlink(tmpname)
                 os.rmdir(backupdir)
             except OSError:
diff -r 90be02035993 -r c9126c24e098 tests/test-record
--- a/tests/test-record	Mon Aug 06 20:31:15 2007 +0200
+++ b/tests/test-record	Mon Aug 06 12:53:17 2007 -0700
@@ -202,3 +202,15 @@
 y
 EOF
 echo; hg tip -p
+
+mkdir subdir
+cd subdir
+echo a > a
+hg ci -d '16 0' -Amsubdir
+
+echo a >> a
+hg record -d '16 0' -m subdir-change a <<EOF
+y
+y
+EOF
+echo; hg tip -p
diff -r 90be02035993 -r c9126c24e098 tests/test-record.out
--- a/tests/test-record.out	Mon Aug 06 20:31:15 2007 +0200
+++ b/tests/test-record.out	Mon Aug 06 12:53:17 2007 -0700
@@ -381,3 +381,23 @@
 +10
 +11
 
+adding subdir/a
+diff --git a/subdir/a b/subdir/a
+1 hunks, 1 lines changed
+record changes to 'subdir/a'? [y]es [n]o @@ -1,1 +1,2 @@ a
+ a
++a
+record this change to 'subdir/a'? [y]es [n]o 
+changeset:   18:33ff5c4fb017
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:16 1970 +0000
+summary:     subdir-change
+
+diff -r aecf2b2ea83c -r 33ff5c4fb017 subdir/a
+--- a/subdir/a	Thu Jan 01 00:00:16 1970 +0000
++++ b/subdir/a	Thu Jan 01 00:00:16 1970 +0000
+@@ -1,1 +1,2 @@ a
+ a
++a
+