Show More
@@ -363,7 +363,7 b' def record(ui, repo, *pats, **opts):' | |||||
363 | try: |
|
363 | try: | |
364 | for realname, tmpname in backups.iteritems(): |
|
364 | for realname, tmpname in backups.iteritems(): | |
365 | ui.debug('restoring %r to %r\n' % (tmpname, realname)) |
|
365 | ui.debug('restoring %r to %r\n' % (tmpname, realname)) | |
366 | util.copyfile(tmpname, realname) |
|
366 | util.copyfile(tmpname, repo.wjoin(realname)) | |
367 | os.unlink(tmpname) |
|
367 | os.unlink(tmpname) | |
368 | os.rmdir(backupdir) |
|
368 | os.rmdir(backupdir) | |
369 | except OSError: |
|
369 | except OSError: |
@@ -202,3 +202,15 b' y' | |||||
202 | y |
|
202 | y | |
203 | EOF |
|
203 | EOF | |
204 | echo; hg tip -p |
|
204 | echo; hg tip -p | |
|
205 | ||||
|
206 | mkdir subdir | |||
|
207 | cd subdir | |||
|
208 | echo a > a | |||
|
209 | hg ci -d '16 0' -Amsubdir | |||
|
210 | ||||
|
211 | echo a >> a | |||
|
212 | hg record -d '16 0' -m subdir-change a <<EOF | |||
|
213 | y | |||
|
214 | y | |||
|
215 | EOF | |||
|
216 | echo; hg tip -p |
@@ -381,3 +381,23 b' diff -r c1c639d8b268 -r 80b74bbc7808 pla' | |||||
381 | +10 |
|
381 | +10 | |
382 | +11 |
|
382 | +11 | |
383 |
|
383 | |||
|
384 | adding subdir/a | |||
|
385 | diff --git a/subdir/a b/subdir/a | |||
|
386 | 1 hunks, 1 lines changed | |||
|
387 | record changes to 'subdir/a'? [y]es [n]o @@ -1,1 +1,2 @@ a | |||
|
388 | a | |||
|
389 | +a | |||
|
390 | record this change to 'subdir/a'? [y]es [n]o | |||
|
391 | changeset: 18:33ff5c4fb017 | |||
|
392 | tag: tip | |||
|
393 | user: test | |||
|
394 | date: Thu Jan 01 00:00:16 1970 +0000 | |||
|
395 | summary: subdir-change | |||
|
396 | ||||
|
397 | diff -r aecf2b2ea83c -r 33ff5c4fb017 subdir/a | |||
|
398 | --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 | |||
|
399 | +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 | |||
|
400 | @@ -1,1 +1,2 @@ a | |||
|
401 | a | |||
|
402 | +a | |||
|
403 |
General Comments 0
You need to be logged in to leave comments.
Login now