##// END OF EJS Templates
merge with i18n
Matt Mackall -
r17351:9d9d1592 merge stable
parent child Browse files
Show More
@@ -5772,7 +5772,7 b' def update(ui, repo, node=None, rev=None'
5772 current named branch and move the current bookmark (see :hg:`help
5772 current named branch and move the current bookmark (see :hg:`help
5773 bookmarks`).
5773 bookmarks`).
5774
5774
5775 Update sets the working directory's parent revison to the specified
5775 Update sets the working directory's parent revision to the specified
5776 changeset (see :hg:`help parents`).
5776 changeset (see :hg:`help parents`).
5777
5777
5778 If the changeset is not a descendant or ancestor of the working
5778 If the changeset is not a descendant or ancestor of the working
@@ -398,7 +398,7 b' def clone(ui, peeropts, source, dest=Non'
398
398
399 if update:
399 if update:
400 if update is not True:
400 if update is not True:
401 checkout = srcrepo.lookup(update)
401 checkout = srcpeer.lookup(update)
402 for test in (checkout, 'default', 'tip'):
402 for test in (checkout, 'default', 'tip'):
403 if test is None:
403 if test is None:
404 continue
404 continue
@@ -77,6 +77,24 b' clone via pull'
77 adding bar
77 adding bar
78 $ cd ..
78 $ cd ..
79
79
80 clone over http with --update
81
82 $ hg clone http://localhost:$HGPORT1/ updated --update 0
83 requesting all changes
84 adding changesets
85 adding manifests
86 adding file changes
87 added 2 changesets with 5 changes to 5 files
88 updating to branch default
89 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
90 $ hg log -r . -R updated
91 changeset: 0:8b6053c928fe
92 user: test
93 date: Thu Jan 01 00:00:00 1970 +0000
94 summary: 1
95
96 $ rm -rf updated
97
80 incoming via HTTP
98 incoming via HTTP
81
99
82 $ hg clone http://localhost:$HGPORT1/ --rev 0 partial
100 $ hg clone http://localhost:$HGPORT1/ --rev 0 partial
General Comments 0
You need to be logged in to leave comments. Login now