Mercurial > hg
changeset 11563:cd6884231db8
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Wed, 14 Jul 2010 21:30:50 +0200 |
| parents | ea2cdee9a1fe (current diff) efbc09fdefd8 (diff) |
| children | 9bbfeba33aa3 |
| files | |
| diffstat | 5 files changed, 73 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/bookmarks.py Wed Jul 14 20:25:31 2010 +0200 +++ b/hgext/bookmarks.py Wed Jul 14 21:30:50 2010 +0200 @@ -146,7 +146,7 @@ marks[mark] = repo.lookup(rev) else: marks[mark] = repo.changectx('.').node() - setcurrent(repo, mark) + setcurrent(repo, mark) write(repo) return
--- a/tests/test-bookmarks-current Wed Jul 14 20:25:31 2010 +0200 +++ b/tests/test-bookmarks-current Wed Jul 14 21:30:50 2010 +0200 @@ -57,3 +57,8 @@ echo % update to tip hg update tip +echo % set bookmark Y using -r . +hg bookmark -r . Y + +echo % list bookmarks +hg bookmark
--- a/tests/test-bookmarks-current.out Wed Jul 14 20:25:31 2010 +0200 +++ b/tests/test-bookmarks-current.out Wed Jul 14 21:30:50 2010 +0200 @@ -25,3 +25,6 @@ no bookmarks set % update to tip 0 files updated, 0 files merged, 0 files removed, 0 files unresolved +% set bookmark Y using -r . +% list bookmarks + * Y 0:719295282060
--- a/tests/test-log Wed Jul 14 20:25:31 2010 +0200 +++ b/tests/test-log Wed Jul 14 21:30:50 2010 +0200 @@ -31,6 +31,11 @@ echo % many renames hg log -vf e +echo % log -pf dir/b +hg log -pf dir/b +echo % log -vf dir/b +hg log -vf dir/b + echo '% log copies with --copies' hg log -vC --template '{rev} {file_copies}\n' echo '% log copies switch without --copies, with old filecopy template'
--- a/tests/test-log.out Wed Jul 14 20:25:31 2010 +0200 +++ b/tests/test-log.out Wed Jul 14 21:30:50 2010 +0200 @@ -76,6 +76,65 @@ a +% log -pf dir/b +changeset: 2:41dd4284081e +user: test +date: Thu Jan 01 00:00:03 1970 +0000 +summary: c + +diff -r 784de7cef101 -r 41dd4284081e dir/b +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 +@@ -0,0 +1,1 @@ ++a + +changeset: 1:784de7cef101 +user: test +date: Thu Jan 01 00:00:02 1970 +0000 +summary: b + +diff -r 8580ff50825a -r 784de7cef101 b +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/b Thu Jan 01 00:00:02 1970 +0000 +@@ -0,0 +1,1 @@ ++a + +changeset: 0:8580ff50825a +user: test +date: Thu Jan 01 00:00:01 1970 +0000 +summary: a + +diff -r 000000000000 -r 8580ff50825a a +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/a Thu Jan 01 00:00:01 1970 +0000 +@@ -0,0 +1,1 @@ ++a + +% log -vf dir/b +changeset: 2:41dd4284081e +user: test +date: Thu Jan 01 00:00:03 1970 +0000 +files: b dir/b +description: +c + + +changeset: 1:784de7cef101 +user: test +date: Thu Jan 01 00:00:02 1970 +0000 +files: b +description: +b + + +changeset: 0:8580ff50825a +user: test +date: Thu Jan 01 00:00:01 1970 +0000 +files: a +description: +a + + % log copies with --copies 4 e (dir/b) 3 b (a)