comparison tests/ignore_and_prioritize.t @ 48:00995da9c204

Implemented priorities, fixed bugs in ignoring, both should work. Testfixes
author Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
date Sun, 25 Sep 2016 21:20:31 +0200
parents e695060c716e
children d76b40291d10
comparison
equal deleted inserted replaced
47:916b05f73b53 48:00995da9c204
21 > [ui] 21 > [ui]
22 > username = Andy Default <default@nowhere.net> 22 > username = Andy Default <default@nowhere.net>
23 > [extensions] 23 > [extensions]
24 > mercurial_all_paths = 24 > mercurial_all_paths =
25 > [all_paths] 25 > [all_paths]
26 > ignore = unknown rep2 26 > ignore = unknown remote2
27 > prioritize = rep3 mystery rep1 27 > prioritize = remote3 mystery remote1
28 > EOF 28 > EOF
29 29
30 We need some repositories to test. 30 We need some repositories to test.
31 31
32 $ hg init "$BASE" 32 $ hg init "$BASE"
56 searching for changes 56 searching for changes
57 adding changesets 57 adding changesets
58 adding manifests 58 adding manifests
59 adding file changes 59 adding file changes
60 added 1 changesets with 1 changes to 1 files 60 added 1 changesets with 1 changes to 1 files
61 61
62 Skipping ignored rep2
63
64 pushing to */rep1 (glob) 62 pushing to */rep1 (glob)
65 searching for changes 63 searching for changes
66 adding changesets 64 adding changesets
67 adding manifests 65 adding manifests
68 adding file changes 66 adding file changes
89 adding rep1.txt 87 adding rep1.txt
90 $ hg --cwd $REP1 commit -m "In repo1" 88 $ hg --cwd $REP1 commit -m "In repo1"
91 89
92 90
93 $ hg --cwd $REP2 update 91 $ hg --cwd $REP2 update
94 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 92 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
95 93
96 $ cat >> $REP2/file.txt << EOF 94 $ cat >> $REP2/file.txt << EOF
97 > From repo2… 95 > From repo2…
98 > EOF 96 > EOF
99 97
100 $ hg --cwd $REP2 add 98 $ hg --cwd $REP2 add
99 adding file.txt
101 $ hg --cwd $REP2 commit -m "In repo2" 100 $ hg --cwd $REP2 commit -m "In repo2"
102 101
103 $ hg --cwd $BASE incomingall 102 $ hg --cwd $BASE incomingall
104 comparing with */rep3 (glob) 103 comparing with */rep3 (glob)
105 searching for changes 104 searching for changes
106 no changes found 105 no changes found
107
108 Skipping ignored rep2
109 106
110 comparing with */rep1 (glob) 107 comparing with */rep1 (glob)
111 searching for changes 108 searching for changes
112 changeset: 1:* (glob) 109 changeset: 1:* (glob)
113 tag: tip 110 tag: tip
117 114
118 $ hg --cwd $BASE pullall 115 $ hg --cwd $BASE pullall
119 pulling from */rep3 (glob) 116 pulling from */rep3 (glob)
120 searching for changes 117 searching for changes
121 no changes found 118 no changes found
122
123 Skipping ignored rep2
124 119
125 pulling from */rep1 (glob) 120 pulling from */rep1 (glob)
126 searching for changes 121 searching for changes
127 adding changesets 122 adding changesets
128 adding manifests 123 adding manifests
142 parent: 0:.* (re) 137 parent: 0:.* (re)
143 user: Andy Default <default@nowhere.net> 138 user: Andy Default <default@nowhere.net>
144 date: .* (re) 139 date: .* (re)
145 summary: In repo2 140 summary: In repo2
146 141
147 Skipping ignored rep2
148
149 comparing with */rep3 (glob) 142 comparing with */rep3 (glob)
150 searching for changes 143 searching for changes
151 changeset: 1:* (glob) 144 changeset: 1:* (glob)
152 user: Andy Default <default@nowhere.net> 145 user: Andy Default <default@nowhere.net>
153 date: .* (re) 146 date: .* (re)