| author | Na'Tosha Bard <natosha@unity3d.com> |
| Sun, 08 Jan 2012 11:19:51 +0100 | |
| branch | stable |
| changeset 15786 | aca0f2b3c7e3 |
| parent 14164 | cb98fed52495 |
| child 15446 | c5c9ca3719f9 |
| permissions | -rw-r--r-- |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
1 |
initialize |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
2 |
|
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
3 |
$ hg init a |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
4 |
$ cd a |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
5 |
$ echo 'test' > test |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
6 |
$ hg commit -Am'test' |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
7 |
adding test |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
8 |
|
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
9 |
set bookmarks |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
10 |
|
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
11 |
$ hg bookmark X |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
12 |
$ hg bookmark Y |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
13 |
$ hg bookmark Z |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
14 |
|
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
15 |
import bookmark by name |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
16 |
|
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
17 |
$ hg init ../b |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
18 |
$ cd ../b |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
19 |
$ hg book Y |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
20 |
$ hg book |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
21 |
* Y -1:000000000000 |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
22 |
$ hg pull ../a |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
23 |
pulling from ../a |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
24 |
requesting all changes |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
25 |
adding changesets |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
26 |
adding manifests |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
27 |
adding file changes |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
28 |
added 1 changesets with 1 changes to 1 files |
|
13662
80d6e1f63ed9
localrepo: do not update bookmarks in addchangegroup
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
29 |
updating bookmark Y |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
30 |
(run 'hg update' to get a working copy) |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
31 |
$ hg bookmarks |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
32 |
Y 0:4e3505fd9583 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
33 |
$ hg debugpushkey ../a namespaces |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
34 |
bookmarks |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
35 |
namespaces |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
36 |
$ hg debugpushkey ../a bookmarks |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
37 |
Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
38 |
X 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
39 |
Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
40 |
$ hg pull -B X ../a |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
41 |
pulling from ../a |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
42 |
no changes found |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
43 |
importing bookmark X |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
44 |
$ hg bookmark |
|
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
45 |
X 0:4e3505fd9583 |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
46 |
Y 0:4e3505fd9583 |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
47 |
|
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
48 |
export bookmark by name |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
49 |
|
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
50 |
$ hg bookmark W |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
51 |
$ hg bookmark foo |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
52 |
$ hg bookmark foobar |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
53 |
$ hg push -B W ../a |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
54 |
pushing to ../a |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
55 |
searching for changes |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
56 |
no changes found |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
57 |
exporting bookmark W |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
58 |
$ hg -R ../a bookmarks |
|
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
59 |
W -1:000000000000 |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
60 |
X 0:4e3505fd9583 |
|
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
61 |
Y 0:4e3505fd9583 |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
62 |
* Z 0:4e3505fd9583 |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
63 |
|
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
64 |
delete a remote bookmark |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
65 |
|
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
66 |
$ hg book -d W |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
67 |
$ hg push -B W ../a |
|
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
68 |
pushing to ../a |
|
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
69 |
searching for changes |
|
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
70 |
no changes found |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
71 |
deleting remote bookmark W |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
72 |
|
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
73 |
push/pull name that doesn't exist |
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
74 |
|
|
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
75 |
$ hg push -B badname ../a |
|
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
76 |
pushing to ../a |
|
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
77 |
searching for changes |
|
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
78 |
no changes found |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
79 |
bookmark badname does not exist on the local or remote repository! |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12303
diff
changeset
|
80 |
[2] |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
81 |
$ hg pull -B anotherbadname ../a |
|
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
82 |
pulling from ../a |
|
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
83 |
abort: remote bookmark anotherbadname not found! |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12303
diff
changeset
|
84 |
[255] |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
85 |
|
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
86 |
divergent bookmarks |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
87 |
|
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
88 |
$ cd ../a |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
89 |
$ echo c1 > f1 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
90 |
$ hg ci -Am1 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
91 |
adding f1 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
92 |
$ hg book -f X |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
93 |
$ hg book |
|
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
94 |
* X 1:0d2164f0ce0d |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
95 |
Y 0:4e3505fd9583 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
96 |
Z 1:0d2164f0ce0d |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
97 |
|
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
98 |
$ cd ../b |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
99 |
$ hg up |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
100 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
101 |
$ echo c2 > f2 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
102 |
$ hg ci -Am2 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
103 |
adding f2 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
104 |
$ hg book -f X |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
105 |
$ hg book |
|
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
106 |
* X 1:9b140be10808 |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
107 |
Y 0:4e3505fd9583 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
108 |
foo -1:000000000000 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
109 |
foobar -1:000000000000 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
110 |
|
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
111 |
$ hg pull ../a |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
112 |
pulling from ../a |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
113 |
searching for changes |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
114 |
adding changesets |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
115 |
adding manifests |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
116 |
adding file changes |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
117 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
118 |
not updating divergent bookmark X |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
119 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
120 |
$ hg book |
|
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
121 |
* X 1:9b140be10808 |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
122 |
Y 0:4e3505fd9583 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
123 |
foo -1:000000000000 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
124 |
foobar -1:000000000000 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
125 |
$ hg push -f ../a |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
126 |
pushing to ../a |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
127 |
searching for changes |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
128 |
adding changesets |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
129 |
adding manifests |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
130 |
adding file changes |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
131 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
132 |
$ hg -R ../a book |
|
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
133 |
* X 1:0d2164f0ce0d |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
134 |
Y 0:4e3505fd9583 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
135 |
Z 1:0d2164f0ce0d |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
136 |
|
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
137 |
hgweb |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
138 |
|
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
139 |
$ cat <<EOF > .hg/hgrc |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
140 |
> [web] |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
141 |
> push_ssl = false |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
142 |
> allow_push = * |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
143 |
> EOF |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
144 |
|
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
145 |
$ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
146 |
$ cat ../hg.pid >> $DAEMON_PIDS |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
147 |
$ cd ../a |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
148 |
|
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
149 |
$ hg debugpushkey http://localhost:$HGPORT/ namespaces |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
150 |
bookmarks |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
151 |
namespaces |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
152 |
$ hg debugpushkey http://localhost:$HGPORT/ bookmarks |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
153 |
Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
154 |
X 9b140be1080824d768c5a4691a564088eede71f9 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
155 |
foo 0000000000000000000000000000000000000000 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
156 |
foobar 0000000000000000000000000000000000000000 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
157 |
$ hg out -B http://localhost:$HGPORT/ |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
158 |
comparing with http://localhost:$HGPORT/ |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
159 |
searching for changed bookmarks |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
160 |
Z 0d2164f0ce0d |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
161 |
$ hg push -B Z http://localhost:$HGPORT/ |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
162 |
pushing to http://localhost:$HGPORT/ |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
163 |
searching for changes |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
164 |
no changes found |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
165 |
exporting bookmark Z |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
166 |
$ hg book -d Z |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
167 |
$ hg in -B http://localhost:$HGPORT/ |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
168 |
comparing with http://localhost:$HGPORT/ |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
169 |
searching for changed bookmarks |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
170 |
Z 0d2164f0ce0d |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
171 |
foo 000000000000 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
172 |
foobar 000000000000 |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
173 |
$ hg pull -B Z http://localhost:$HGPORT/ |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
174 |
pulling from http://localhost:$HGPORT/ |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
175 |
no changes found |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
176 |
not updating divergent bookmark X |
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
177 |
importing bookmark Z |
|
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
178 |
$ hg clone http://localhost:$HGPORT/ cloned-bookmarks |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
179 |
requesting all changes |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
180 |
adding changesets |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
181 |
adding manifests |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
182 |
adding file changes |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
183 |
added 3 changesets with 3 changes to 3 files (+1 heads) |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
184 |
updating to branch default |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
185 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
186 |
$ hg -R cloned-bookmarks bookmarks |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
187 |
X 1:9b140be10808 |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
188 |
Y 0:4e3505fd9583 |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
189 |
Z 2:0d2164f0ce0d |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
190 |
foo -1:000000000000 |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
191 |
foobar -1:000000000000 |
|
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
192 |
|
|
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
193 |
$ kill `cat ../hg.pid` |