Mercurial > hg
annotate tests/test-bookmarks-pushpull.t @ 22792:bec4365a0707
addset: this is a smartset, update the docstring
The documentation was still stating that this class is a not a smartset. We drop
that part.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 03 Oct 2014 20:17:12 -0700 |
parents | 798185707833 |
children | fab9dda0f2a3 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
21580
diff
changeset
|
1 #require serve |
15446
c5c9ca3719f9
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents:
14164
diff
changeset
|
2 |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
3 $ cat << EOF >> $HGRCPATH |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
4 > [ui] |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
5 > logtemplate={rev}:{node|short} {desc|firstline} |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
6 > [phases] |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
7 > publish=False |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
8 > [extensions] |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
9 > EOF |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
10 $ cat > obs.py << EOF |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
11 > import mercurial.obsolete |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
12 > mercurial.obsolete._enabled = True |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
13 > EOF |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
14 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
15 |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
16 initialize |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
17 |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
18 $ hg init a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
19 $ cd a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
20 $ echo 'test' > test |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
21 $ hg commit -Am'test' |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
22 adding test |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
23 |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
24 set bookmarks |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
25 |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
26 $ hg bookmark X |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
27 $ hg bookmark Y |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
28 $ hg bookmark Z |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
29 |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
30 import bookmark by name |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
31 |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
32 $ hg init ../b |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
33 $ cd ../b |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
34 $ hg book Y |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
35 $ hg book |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
36 * Y -1:000000000000 |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
37 $ hg pull ../a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
38 pulling from ../a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
39 requesting all changes |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
40 adding changesets |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
41 adding manifests |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
42 adding file changes |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
43 added 1 changesets with 1 changes to 1 files |
18363
c6e033a7dd38
bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18255
diff
changeset
|
44 adding remote bookmark X |
13662
80d6e1f63ed9
localrepo: do not update bookmarks in addchangegroup
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
45 updating bookmark Y |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
46 adding remote bookmark Z |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
47 (run 'hg update' to get a working copy) |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
48 $ hg bookmarks |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
49 X 0:4e3505fd9583 |
18479
0efd5686f80c
bookmarks: show active bookmark even if not at working dir
Kevin Bullock <kbullock@ringworld.org>
parents:
18470
diff
changeset
|
50 * Y 0:4e3505fd9583 |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
51 Z 0:4e3505fd9583 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
52 $ hg debugpushkey ../a namespaces |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
53 bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
54 namespaces |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
55 obsolete |
18255
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17882
diff
changeset
|
56 phases |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
57 $ hg debugpushkey ../a bookmarks |
18255
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17882
diff
changeset
|
58 X 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
59 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
60 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
61 $ hg pull -B X ../a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
62 pulling from ../a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
63 no changes found |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
64 $ hg bookmark |
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
65 X 0:4e3505fd9583 |
18479
0efd5686f80c
bookmarks: show active bookmark even if not at working dir
Kevin Bullock <kbullock@ringworld.org>
parents:
18470
diff
changeset
|
66 * Y 0:4e3505fd9583 |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
67 Z 0:4e3505fd9583 |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
68 |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
69 export bookmark by name |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
70 |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
71 $ hg bookmark W |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
72 $ hg bookmark foo |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
73 $ hg bookmark foobar |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
74 $ hg push -B W ../a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
75 pushing to ../a |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
76 searching for changes |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
77 no changes found |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
78 exporting bookmark W |
16038
dad96e752079
push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents:
16010
diff
changeset
|
79 [1] |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
80 $ hg -R ../a bookmarks |
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
81 W -1:000000000000 |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
82 X 0:4e3505fd9583 |
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
83 Y 0:4e3505fd9583 |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
84 * Z 0:4e3505fd9583 |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
85 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
86 delete a remote bookmark |
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 $ hg book -d W |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
89 $ hg push -B W ../a |
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
90 pushing to ../a |
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
91 searching for changes |
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
92 no changes found |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
93 deleting remote bookmark W |
16038
dad96e752079
push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents:
16010
diff
changeset
|
94 [1] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
95 |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
96 push/pull name that doesn't exist |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
97 |
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
98 $ hg push -B badname ../a |
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
99 pushing to ../a |
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
100 searching for changes |
22651
b901645a8784
push: gather all bookmark decisions together
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
101 bookmark badname does not exist on the local or remote repository! |
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
102 no changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12303
diff
changeset
|
103 [2] |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
104 $ hg pull -B anotherbadname ../a |
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
12969
diff
changeset
|
105 pulling from ../a |
12303
4ab87473029d
tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff
changeset
|
106 abort: remote bookmark anotherbadname not found! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12303
diff
changeset
|
107 [255] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
108 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
109 divergent bookmarks |
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 $ cd ../a |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
112 $ echo c1 > f1 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
113 $ hg ci -Am1 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
114 adding f1 |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
115 $ hg book -f @ |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
116 $ hg book -f X |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
117 $ hg book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
118 @ 1:0d2164f0ce0d |
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
119 * X 1:0d2164f0ce0d |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
120 Y 0:4e3505fd9583 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
121 Z 1:0d2164f0ce0d |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
122 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
123 $ cd ../b |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
124 $ hg up |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
125 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16010
c7811ca6fb94
update: note updated bookmark
Kevin Bullock <kbullock@ringworld.org>
parents:
15935
diff
changeset
|
126 updating bookmark foobar |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
127 $ echo c2 > f2 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
128 $ hg ci -Am2 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
129 adding f2 |
18470
28b3d669295e
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents:
18363
diff
changeset
|
130 $ hg book -if @ |
28b3d669295e
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents:
18363
diff
changeset
|
131 $ hg book -if X |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
132 $ hg book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
133 @ 1:9b140be10808 |
18470
28b3d669295e
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents:
18363
diff
changeset
|
134 X 1:9b140be10808 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
135 Y 0:4e3505fd9583 |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
136 Z 0:4e3505fd9583 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
137 foo -1:000000000000 |
18470
28b3d669295e
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents:
18363
diff
changeset
|
138 * foobar 1:9b140be10808 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
139 |
15614
260a6449d83a
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
Matt Mackall <mpm@selenic.com>
parents:
15613
diff
changeset
|
140 $ hg pull --config paths.foo=../a foo |
17021
955662c1d0e9
test-bookmarks-pushpull: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16913
diff
changeset
|
141 pulling from $TESTTMP/a (glob) |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
142 searching for changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
143 adding changesets |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
144 adding manifests |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
145 adding file changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
146 added 1 changesets with 1 changes to 1 files (+1 heads) |
18363
c6e033a7dd38
bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18255
diff
changeset
|
147 divergent bookmark @ stored as @foo |
15614
260a6449d83a
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
Matt Mackall <mpm@selenic.com>
parents:
15613
diff
changeset
|
148 divergent bookmark X stored as X@foo |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
149 updating bookmark Z |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
150 (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
|
151 $ hg book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
152 @ 1:9b140be10808 |
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
153 @foo 2:0d2164f0ce0d |
18470
28b3d669295e
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents:
18363
diff
changeset
|
154 X 1:9b140be10808 |
15614
260a6449d83a
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
Matt Mackall <mpm@selenic.com>
parents:
15613
diff
changeset
|
155 X@foo 2:0d2164f0ce0d |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
156 Y 0:4e3505fd9583 |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
157 Z 2:0d2164f0ce0d |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
158 foo -1:000000000000 |
18470
28b3d669295e
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents:
18363
diff
changeset
|
159 * foobar 1:9b140be10808 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
160 $ hg push -f ../a |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
161 pushing to ../a |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
162 searching for changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
163 adding changesets |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
164 adding manifests |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
165 adding file changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
166 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
|
167 $ hg -R ../a book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
168 @ 1:0d2164f0ce0d |
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13368
diff
changeset
|
169 * X 1:0d2164f0ce0d |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
170 Y 0:4e3505fd9583 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
171 Z 1:0d2164f0ce0d |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
172 |
18495
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
173 revsets should not ignore divergent bookmarks |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
174 |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
175 $ hg bookmark -fr 1 Z |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
176 $ hg log -r 'bookmark()' --template '{rev}:{node|short} {bookmarks}\n' |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
177 0:4e3505fd9583 Y |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
178 1:9b140be10808 @ X Z foobar |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
179 2:0d2164f0ce0d @foo X@foo |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
180 $ hg log -r 'bookmark("X@foo")' --template '{rev}:{node|short} {bookmarks}\n' |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
181 2:0d2164f0ce0d @foo X@foo |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
182 $ hg log -r 'bookmark("re:X@foo")' --template '{rev}:{node|short} {bookmarks}\n' |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
183 2:0d2164f0ce0d @foo X@foo |
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
184 |
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
185 update a remote bookmark from a non-head to a head |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
186 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
187 $ hg up -q Y |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
188 $ echo c3 > f2 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
189 $ hg ci -Am3 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
190 adding f2 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
191 created new head |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
192 $ hg push ../a |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
193 pushing to ../a |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
194 searching for changes |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
195 adding changesets |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
196 adding manifests |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
197 adding file changes |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
198 added 1 changesets with 1 changes to 1 files (+1 heads) |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
199 updating bookmark Y |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
200 $ hg -R ../a book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
201 @ 1:0d2164f0ce0d |
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
202 * X 1:0d2164f0ce0d |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
203 Y 3:f6fc62dde3c0 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
204 Z 1:0d2164f0ce0d |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
205 |
18851
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
206 update a bookmark in the middle of a client pulling changes |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
207 |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
208 $ cd .. |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
209 $ hg clone -q a pull-race |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
210 $ hg clone -q pull-race pull-race2 |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
211 $ cd pull-race |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
212 $ hg up -q Y |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
213 $ echo c4 > f2 |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
214 $ hg ci -Am4 |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
215 $ echo c5 > f3 |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
216 $ cat <<EOF > .hg/hgrc |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
217 > [hooks] |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
218 > outgoing.makecommit = hg ci -Am5; echo committed in pull-race |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
219 > EOF |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
220 $ cd ../pull-race2 |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
221 $ hg pull |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
222 pulling from $TESTTMP/pull-race (glob) |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
223 searching for changes |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
224 adding changesets |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
225 adding f3 |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
226 committed in pull-race |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
227 adding manifests |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
228 adding file changes |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
229 added 1 changesets with 1 changes to 1 files |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
230 updating bookmark Y |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
231 (run 'hg update' to get a working copy) |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
232 $ hg book |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
233 * @ 1:0d2164f0ce0d |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
234 X 1:0d2164f0ce0d |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
235 Y 4:b0a5eff05604 |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
236 Z 1:0d2164f0ce0d |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
237 $ cd ../b |
a60963c02f92
pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents:
18495
diff
changeset
|
238 |
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
239 diverging a remote bookmark fails |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
240 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
241 $ hg up -q 4e3505fd9583 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
242 $ echo c4 > f2 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
243 $ hg ci -Am4 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
244 adding f2 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
245 created new head |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
246 $ echo c5 > f2 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
247 $ hg ci -Am5 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
248 $ hg log -G |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
249 @ 5:c922c0139ca0 5 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
250 | |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
251 o 4:4efff6d98829 4 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
252 | |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
253 | o 3:f6fc62dde3c0 3 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
254 |/ |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
255 | o 2:0d2164f0ce0d 1 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
256 |/ |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
257 | o 1:9b140be10808 2 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
258 |/ |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
259 o 0:4e3505fd9583 test |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
260 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
261 |
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
262 $ hg book -f Y |
17043
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
263 |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
264 $ cat <<EOF > ../a/.hg/hgrc |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
265 > [web] |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
266 > push_ssl = false |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
267 > allow_push = * |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
268 > EOF |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
269 |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
270 $ hg -R ../a serve -p $HGPORT2 -d --pid-file=../hg2.pid |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
271 $ cat ../hg2.pid >> $DAEMON_PIDS |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
272 |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
273 $ hg push http://localhost:$HGPORT2/ |
6f89c3f0192d
fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents:
17021
diff
changeset
|
274 pushing to http://localhost:$HGPORT2/ |
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
275 searching for changes |
21580
32601b0b74c0
discovery: if a push would create a new head, mention the bookmark name if any
Stephen Lee <sphen.lee@gmail.com>
parents:
21404
diff
changeset
|
276 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19515
diff
changeset
|
277 (merge or see "hg help push" for details about pushing new heads) |
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
278 [255] |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
279 $ hg -R ../a book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
280 @ 1:0d2164f0ce0d |
16835
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
281 * X 1:0d2164f0ce0d |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
282 Y 3:f6fc62dde3c0 |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
283 Z 1:0d2164f0ce0d |
4267c840c481
bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents:
16697
diff
changeset
|
284 |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
285 |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
286 Unrelated marker does not alter the decision |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
287 |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
288 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
289 $ hg push http://localhost:$HGPORT2/ |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
290 pushing to http://localhost:$HGPORT2/ |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
291 searching for changes |
21580
32601b0b74c0
discovery: if a push would create a new head, mention the bookmark name if any
Stephen Lee <sphen.lee@gmail.com>
parents:
21404
diff
changeset
|
292 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19515
diff
changeset
|
293 (merge or see "hg help push" for details about pushing new heads) |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
294 [255] |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
295 $ hg -R ../a book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
296 @ 1:0d2164f0ce0d |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
297 * X 1:0d2164f0ce0d |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
298 Y 3:f6fc62dde3c0 |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
299 Z 1:0d2164f0ce0d |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
300 |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
301 Update to a successor works |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
302 |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
303 $ hg id --debug -r 3 |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
304 f6fc62dde3c0771e29704af56ba4d8af77abcc2f |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
305 $ hg id --debug -r 4 |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
306 4efff6d98829d9c824c621afd6e3f01865f5439f |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
307 $ hg id --debug -r 5 |
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
308 c922c0139ca03858f655e4a2af4dd02796a63969 tip Y |
17865
daf32ebfde6b
bookmark: prevent crashing when a successor is unknown locally (issue3680)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17864
diff
changeset
|
309 $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc |
daf32ebfde6b
bookmark: prevent crashing when a successor is unknown locally (issue3680)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17864
diff
changeset
|
310 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
311 $ hg push http://localhost:$HGPORT2/ |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
312 pushing to http://localhost:$HGPORT2/ |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
313 searching for changes |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
314 remote: adding changesets |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
315 remote: adding manifests |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
316 remote: adding file changes |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
317 remote: added 2 changesets with 2 changes to 1 files (+1 heads) |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
318 updating bookmark Y |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
319 $ hg -R ../a book |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
320 @ 1:0d2164f0ce0d |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
321 * X 1:0d2164f0ce0d |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
322 Y 5:c922c0139ca0 |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
323 Z 1:0d2164f0ce0d |
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
324 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
325 hgweb |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
326 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
327 $ cat <<EOF > .hg/hgrc |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
328 > [web] |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
329 > push_ssl = false |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
330 > allow_push = * |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
331 > EOF |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
332 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
333 $ 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
|
334 $ 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
|
335 $ cd ../a |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
336 |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17298
diff
changeset
|
337 $ hg debugpushkey http://localhost:$HGPORT/ namespaces |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
338 bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
339 namespaces |
17551
a7b3fdaf768d
bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17548
diff
changeset
|
340 obsolete |
18255
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17882
diff
changeset
|
341 phases |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
342 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
343 @ 9b140be1080824d768c5a4691a564088eede71f9 |
18255
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17882
diff
changeset
|
344 X 9b140be1080824d768c5a4691a564088eede71f9 |
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17882
diff
changeset
|
345 Y c922c0139ca03858f655e4a2af4dd02796a63969 |
18495
8260fa9f30b9
bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents:
18479
diff
changeset
|
346 Z 9b140be1080824d768c5a4691a564088eede71f9 |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
347 foo 0000000000000000000000000000000000000000 |
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
348 foobar 9b140be1080824d768c5a4691a564088eede71f9 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
349 $ 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
|
350 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
|
351 searching for changed bookmarks |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
352 no changed bookmarks found |
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
353 [1] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
354 $ 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
|
355 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
|
356 searching for changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
357 no changes found |
22651
b901645a8784
push: gather all bookmark decisions together
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
358 updating bookmark Z |
16038
dad96e752079
push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents:
16010
diff
changeset
|
359 [1] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
360 $ hg book -d Z |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
361 $ 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
|
362 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
|
363 searching for changed bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
364 Z 0d2164f0ce0d |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
365 foo 000000000000 |
15935
6c97eb445341
bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
Matt Mackall <mpm@selenic.com>
parents:
15648
diff
changeset
|
366 foobar 9b140be10808 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
367 $ 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
|
368 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
|
369 no changes found |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
370 divergent bookmark @ stored as @1 |
18363
c6e033a7dd38
bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18255
diff
changeset
|
371 divergent bookmark X stored as X@1 |
c6e033a7dd38
bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18255
diff
changeset
|
372 adding remote bookmark Z |
17770
6c81b8ebf66e
bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents:
17551
diff
changeset
|
373 adding remote bookmark foo |
16697
c285aae10f6c
bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents:
16107
diff
changeset
|
374 adding remote bookmark foobar |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
375 $ hg clone http://localhost:$HGPORT/ cloned-bookmarks |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
376 requesting all changes |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
377 adding changesets |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
378 adding manifests |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
379 adding file changes |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
380 added 5 changesets with 5 changes to 3 files (+2 heads) |
17882
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17872
diff
changeset
|
381 updating to bookmark @ |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
382 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
|
383 $ hg -R cloned-bookmarks bookmarks |
17870
7d2dd10ce9ea
clone: activate @ bookmark if updating to it
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17865
diff
changeset
|
384 * @ 1:9b140be10808 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
385 X 1:9b140be10808 |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
386 Y 4:c922c0139ca0 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
387 Z 2:0d2164f0ce0d |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
388 foo -1:000000000000 |
15935
6c97eb445341
bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
Matt Mackall <mpm@selenic.com>
parents:
15648
diff
changeset
|
389 foobar 1:9b140be10808 |
17346
2944a6d35158
check-code: fix check for trailing whitespace on empty lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
390 |
17189
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
391 $ cd .. |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
392 |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
393 Pushing a bookmark should only push the changes required by that |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
394 bookmark, not all outgoing changes: |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
395 $ hg clone http://localhost:$HGPORT/ addmarks |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
396 requesting all changes |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
397 adding changesets |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
398 adding manifests |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
399 adding file changes |
17864
d044a762f47f
bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17770
diff
changeset
|
400 added 5 changesets with 5 changes to 3 files (+2 heads) |
17882
36ed69d4593d
clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents:
17872
diff
changeset
|
401 updating to bookmark @ |
17189
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
402 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
403 $ cd addmarks |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
404 $ echo foo > foo |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
405 $ hg add foo |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
406 $ hg commit -m 'add foo' |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
407 $ echo bar > bar |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
408 $ hg add bar |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
409 $ hg commit -m 'add bar' |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
410 $ hg co "tip^" |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
411 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
21404
ca275f7ec576
update: when deactivating a bookmark, print a message
Siddharth Agarwal <sid0@fb.com>
parents:
20184
diff
changeset
|
412 (leaving bookmark @) |
17189
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
413 $ hg book add-foo |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
414 $ hg book -r tip add-bar |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
415 Note: this push *must* push only a single changeset, as that's the point |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
416 of this test. |
17548
eaa5fcc5bd20
checkheads: check successors for new heads in both missing and common
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17346
diff
changeset
|
417 $ hg push -B add-foo --traceback |
17189
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
418 pushing to http://localhost:$HGPORT/ |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
419 searching for changes |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
420 remote: adding changesets |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
421 remote: adding manifests |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
422 remote: adding file changes |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
423 remote: added 1 changesets with 1 changes to 1 files |
7199e82d6d8b
test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents:
17075
diff
changeset
|
424 exporting bookmark add-foo |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12346
diff
changeset
|
425 |
20184
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
426 pushing a new bookmark on a new head does not require -f if -B is specified |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
427 |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
428 $ hg up -q X |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
429 $ hg book W |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
430 $ echo c5 > f2 |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
431 $ hg ci -Am5 |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
432 created new head |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
433 $ hg push -B W |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
434 pushing to http://localhost:$HGPORT/ |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
435 searching for changes |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
436 remote: adding changesets |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
437 remote: adding manifests |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
438 remote: adding file changes |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
439 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
440 exporting bookmark W |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
441 $ hg -R ../b id -r W |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
442 cc978a373a53 tip W |
a14d93b2fb1b
bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents:
19934
diff
changeset
|
443 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16835
diff
changeset
|
444 $ cd .. |