Mercurial > hg
annotate tests/test-pull.t @ 13446:1e497df514e2 stable
rollback: clarifies the message about the reverted state (issue2628)
Previously, when rolling back a transaction, some users could be confused
between the level to which the store is rolled back, and the new parents
of the working directory.
$ hg rollback
rolling back to revision 4 (undo commit)
With this change:
$ hg rollback
repository tip rolled back to tip revision 4 (undo commit)
working directory now based on revision 2 and 1
So now the user can realize that the store has been rolled back to an older
tip, but also that the working directory may not on the tip (here we are
rolling back the merge of the heads 2 and 1)
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Thu, 10 Feb 2011 09:03:06 +0100 |
parents | d08bb64888bc |
children | 7f18bab2c0b0 |
rev | line source |
---|---|
12279 | 1 $ mkdir test |
2 $ cd test | |
3 | |
4 $ echo foo>foo | |
5 $ hg init | |
6 $ hg addremove | |
7 adding foo | |
8 $ hg commit -m 1 | |
9 | |
10 $ hg verify | |
11 checking changesets | |
12 checking manifests | |
13 crosschecking files in changesets and manifests | |
14 checking files | |
15 1 files, 1 changesets, 1 total revisions | |
336 | 16 |
12279 | 17 $ hg serve -p $HGPORT -d --pid-file=hg.pid |
18 $ cat hg.pid >> $DAEMON_PIDS | |
19 $ cd .. | |
20 | |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
21 $ hg clone --pull http://foo:bar@localhost:$HGPORT/ copy |
12279 | 22 requesting all changes |
23 adding changesets | |
24 adding manifests | |
25 adding file changes | |
26 added 1 changesets with 1 changes to 1 files | |
27 updating to branch default | |
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
29 | |
30 $ cd copy | |
31 $ hg verify | |
32 checking changesets | |
33 checking manifests | |
34 crosschecking files in changesets and manifests | |
35 checking files | |
36 1 files, 1 changesets, 1 total revisions | |
336 | 37 |
12279 | 38 $ hg co |
39 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
40 $ cat foo | |
41 foo | |
42 | |
43 $ hg manifest --debug | |
44 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo | |
45 | |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
46 $ hg pull |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12505
diff
changeset
|
47 pulling from http://foo:***@localhost:$HGPORT/ |
12279 | 48 searching for changes |
49 no changes found | |
50 | |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12328
diff
changeset
|
51 $ hg rollback --dry-run --verbose |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12643
diff
changeset
|
52 repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/) |
12279 | 53 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12377
diff
changeset
|
54 Issue622: hg init && hg pull -u URL doesn't checkout default branch |
4891
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
3736
diff
changeset
|
55 |
12279 | 56 $ cd .. |
57 $ hg init empty | |
58 $ cd empty | |
59 $ hg pull -u ../test | |
60 pulling from ../test | |
61 requesting all changes | |
62 adding changesets | |
63 adding manifests | |
64 adding file changes | |
65 added 1 changesets with 1 changes to 1 files | |
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
9996
2770d03ae49f
handle file URIs correctly, according to RFC 2396 (issue1153)
Sune Foldager <cryo@cyanite.org>
parents:
5384
diff
changeset
|
67 |
12279 | 68 Test 'file:' uri handling: |
69 | |
70 $ hg pull -q file://../test-doesnt-exist | |
71 abort: repository /test-doesnt-exist not found! | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
72 [255] |
12279 | 73 |
74 $ hg pull -q file:../test | |
75 | |
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
76 It's tricky to make file:// URLs working on every platform with |
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
77 regular shell commands. |
12279 | 78 |
79 $ URL=`python -c "import os; print 'file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"` | |
80 $ hg pull -q "$URL" | |
81 |