Show More
@@ -809,7 +809,7 b' Check hook preventing push (issue4455)' | |||||
809 | > ssh=ssh://user@dummy/issue4455-dest |
|
809 | > ssh=ssh://user@dummy/issue4455-dest | |
810 | > http=http://localhost:$HGPORT/ |
|
810 | > http=http://localhost:$HGPORT/ | |
811 | > [ui] |
|
811 | > [ui] | |
812 |
> ssh= |
|
812 | > ssh=$PYTHON "$TESTDIR/dummyssh" | |
813 | > EOF |
|
813 | > EOF | |
814 | $ cat >> ../issue4455-dest/.hg/hgrc << EOF |
|
814 | $ cat >> ../issue4455-dest/.hg/hgrc << EOF | |
815 | > [hooks] |
|
815 | > [hooks] |
@@ -18,7 +18,7 b' enable obsolescence' | |||||
18 | > evolution=createmarkers,exchange |
|
18 | > evolution=createmarkers,exchange | |
19 | > bundle2-output-capture=True |
|
19 | > bundle2-output-capture=True | |
20 | > [ui] |
|
20 | > [ui] | |
21 |
> ssh= |
|
21 | > ssh=$PYTHON "$TESTDIR/dummyssh" | |
22 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
|
22 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} | |
23 | > [web] |
|
23 | > [web] | |
24 | > push_ssl = false |
|
24 | > push_ssl = false | |
@@ -909,7 +909,7 b' Test lazily acquiring the lock during un' | |||||
909 | $ cp $TESTTMP/hgrc.orig $HGRCPATH |
|
909 | $ cp $TESTTMP/hgrc.orig $HGRCPATH | |
910 | $ cat >> $HGRCPATH <<EOF |
|
910 | $ cat >> $HGRCPATH <<EOF | |
911 | > [ui] |
|
911 | > [ui] | |
912 |
> ssh= |
|
912 | > ssh=$PYTHON "$TESTDIR/dummyssh" | |
913 | > EOF |
|
913 | > EOF | |
914 |
|
914 | |||
915 | $ cat >> $TESTTMP/locktester.py <<EOF |
|
915 | $ cat >> $TESTTMP/locktester.py <<EOF |
@@ -229,7 +229,7 b' Create an extension to test bundle2 API' | |||||
229 | > [experimental] |
|
229 | > [experimental] | |
230 | > evolution=createmarkers |
|
230 | > evolution=createmarkers | |
231 | > [ui] |
|
231 | > [ui] | |
232 |
> ssh= |
|
232 | > ssh=$PYTHON "$TESTDIR/dummyssh" | |
233 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
|
233 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} | |
234 | > [web] |
|
234 | > [web] | |
235 | > push_ssl = false |
|
235 | > push_ssl = false |
@@ -79,7 +79,7 b' Start a simple HTTP server to serve bund' | |||||
79 |
|
79 | |||
80 | $ cat >> $HGRCPATH << EOF |
|
80 | $ cat >> $HGRCPATH << EOF | |
81 | > [ui] |
|
81 | > [ui] | |
82 |
> ssh= |
|
82 | > ssh=$PYTHON "$TESTDIR/dummyssh" | |
83 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
|
83 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} | |
84 | > EOF |
|
84 | > EOF | |
85 |
|
85 |
@@ -1044,7 +1044,7 b" Test that auto sharing doesn't cause fai" | |||||
1044 | $ hg id -R remote -r 0 |
|
1044 | $ hg id -R remote -r 0 | |
1045 | abort: repository remote not found! |
|
1045 | abort: repository remote not found! | |
1046 | [255] |
|
1046 | [255] | |
1047 |
$ hg --config share.pool=share -q clone -e " |
|
1047 | $ hg --config share.pool=share -q clone -e "$PYTHON \"$TESTDIR/dummyssh\"" a ssh://user@dummy/remote | |
1048 | $ hg -R remote id -r 0 |
|
1048 | $ hg -R remote id -r 0 | |
1049 | acb14030fe0a |
|
1049 | acb14030fe0a | |
1050 |
|
1050 |
@@ -197,7 +197,7 b' by old clients.' | |||||
197 |
|
197 | |||
198 | Feature works over SSH |
|
198 | Feature works over SSH | |
199 |
|
199 | |||
200 |
$ hg clone -U -e " |
|
200 | $ hg clone -U -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/server ssh-full-clone | |
201 | applying clone bundle from http://localhost:$HGPORT1/full.hg |
|
201 | applying clone bundle from http://localhost:$HGPORT1/full.hg | |
202 | adding changesets |
|
202 | adding changesets | |
203 | adding manifests |
|
203 | adding manifests |
@@ -5,7 +5,7 b' when we do a merge.' | |||||
5 | > import sys, os |
|
5 | > import sys, os | |
6 | > print "merging for", os.path.basename(sys.argv[1]) |
|
6 | > print "merging for", os.path.basename(sys.argv[1]) | |
7 | > EOF |
|
7 | > EOF | |
8 |
$ HGMERGE=" |
|
8 | $ HGMERGE="$PYTHON ../merge"; export HGMERGE | |
9 |
|
9 | |||
10 | Creating base: |
|
10 | Creating base: | |
11 |
|
11 |
@@ -87,7 +87,7 b' verify 7e7d56fe4833 (encoding fallback i' | |||||
87 | > EOF |
|
87 | > EOF | |
88 | $ echo baz >> b/foo |
|
88 | $ echo baz >> b/foo | |
89 | $ hg -R b ci -m baz |
|
89 | $ hg -R b ci -m baz | |
90 |
$ hg push -R b -e ' |
|
90 | $ hg push -R b -e '$PYTHON oldhg' ssh://dummy/ --encoding latin1 | |
91 | pushing to ssh://dummy/ |
|
91 | pushing to ssh://dummy/ | |
92 | searching for changes |
|
92 | searching for changes | |
93 | remote: adding changesets |
|
93 | remote: adding changesets |
@@ -106,7 +106,7 b' test failure' | |||||
106 |
|
106 | |||
107 | init+push to remote2 |
|
107 | init+push to remote2 | |
108 |
|
108 | |||
109 |
$ hg init -e " |
|
109 | $ hg init -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote2 | |
110 | $ hg incoming -R remote2 local |
|
110 | $ hg incoming -R remote2 local | |
111 | comparing with local |
|
111 | comparing with local | |
112 | changeset: 0:08b9e9f63b32 |
|
112 | changeset: 0:08b9e9f63b32 | |
@@ -116,7 +116,7 b' init+push to remote2' | |||||
116 | summary: init |
|
116 | summary: init | |
117 |
|
117 | |||
118 |
|
118 | |||
119 |
$ hg push -R local -e " |
|
119 | $ hg push -R local -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote2 | |
120 | pushing to ssh://user@dummy/remote2 |
|
120 | pushing to ssh://user@dummy/remote2 | |
121 | searching for changes |
|
121 | searching for changes | |
122 | remote: adding changesets |
|
122 | remote: adding changesets | |
@@ -126,7 +126,7 b' init+push to remote2' | |||||
126 |
|
126 | |||
127 | clone to remote1 |
|
127 | clone to remote1 | |
128 |
|
128 | |||
129 |
$ hg clone -e " |
|
129 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote1 | |
130 | searching for changes |
|
130 | searching for changes | |
131 | remote: adding changesets |
|
131 | remote: adding changesets | |
132 | remote: adding manifests |
|
132 | remote: adding manifests | |
@@ -134,7 +134,7 b' clone to remote1' | |||||
134 | remote: added 1 changesets with 1 changes to 1 files |
|
134 | remote: added 1 changesets with 1 changes to 1 files | |
135 |
|
135 | |||
136 | The largefiles extension doesn't crash |
|
136 | The largefiles extension doesn't crash | |
137 |
$ hg clone -e " |
|
137 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remotelf --config extensions.largefiles= | |
138 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
|
138 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) | |
139 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
|
139 | The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) | |
140 | searching for changes |
|
140 | searching for changes | |
@@ -145,14 +145,14 b" The largefiles extension doesn't crash" | |||||
145 |
|
145 | |||
146 | init to existing repo |
|
146 | init to existing repo | |
147 |
|
147 | |||
148 |
$ hg init -e " |
|
148 | $ hg init -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote1 | |
149 | abort: repository remote1 already exists! |
|
149 | abort: repository remote1 already exists! | |
150 | abort: could not create remote repo! |
|
150 | abort: could not create remote repo! | |
151 | [255] |
|
151 | [255] | |
152 |
|
152 | |||
153 | clone to existing repo |
|
153 | clone to existing repo | |
154 |
|
154 | |||
155 |
$ hg clone -e " |
|
155 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote1 | |
156 | abort: repository remote1 already exists! |
|
156 | abort: repository remote1 already exists! | |
157 | abort: could not create remote repo! |
|
157 | abort: could not create remote repo! | |
158 | [255] |
|
158 | [255] | |
@@ -251,7 +251,7 b' clone bookmarks' | |||||
251 | $ hg -R local bookmark test |
|
251 | $ hg -R local bookmark test | |
252 | $ hg -R local bookmarks |
|
252 | $ hg -R local bookmarks | |
253 | * test 0:08b9e9f63b32 |
|
253 | * test 0:08b9e9f63b32 | |
254 |
$ hg clone -e " |
|
254 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote-bookmarks | |
255 | searching for changes |
|
255 | searching for changes | |
256 | remote: adding changesets |
|
256 | remote: adding changesets | |
257 | remote: adding manifests |
|
257 | remote: adding manifests |
@@ -112,7 +112,7 b' used all HGPORTs, kill all daemons' | |||||
112 | #endif |
|
112 | #endif | |
113 |
|
113 | |||
114 | vanilla clients locked out from largefiles ssh repos |
|
114 | vanilla clients locked out from largefiles ssh repos | |
115 |
$ hg --config extensions.largefiles=! clone -e " |
|
115 | $ hg --config extensions.largefiles=! clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5 | |
116 | remote: |
|
116 | remote: | |
117 | remote: This repository uses the largefiles extension. |
|
117 | remote: This repository uses the largefiles extension. | |
118 | remote: |
|
118 | remote: |
@@ -10,7 +10,7 b'' | |||||
10 | > |
|
10 | > | |
11 | > print "merging for", os.path.basename(sys.argv[1]) |
|
11 | > print "merging for", os.path.basename(sys.argv[1]) | |
12 | > EOF |
|
12 | > EOF | |
13 |
$ HGMERGE=" |
|
13 | $ HGMERGE="$PYTHON ../merge"; export HGMERGE | |
14 |
|
14 | |||
15 | $ hg init t |
|
15 | $ hg init t | |
16 | $ cd t |
|
16 | $ cd t |
@@ -2,7 +2,7 b'' | |||||
2 | > import sys, os |
|
2 | > import sys, os | |
3 | > print "merging for", os.path.basename(sys.argv[1]) |
|
3 | > print "merging for", os.path.basename(sys.argv[1]) | |
4 | > EOF |
|
4 | > EOF | |
5 |
$ HGMERGE=" |
|
5 | $ HGMERGE="$PYTHON ../merge"; export HGMERGE | |
6 |
|
6 | |||
7 | $ hg init A1 |
|
7 | $ hg init A1 | |
8 | $ cd A1 |
|
8 | $ cd A1 |
@@ -47,7 +47,7 b' args:' | |||||
47 | > echo "--------------" |
|
47 | > echo "--------------" | |
48 | > echo "test L:$1 R:$2 W:$3 - $4" |
|
48 | > echo "test L:$1 R:$2 W:$3 - $4" | |
49 | > echo "--------------" |
|
49 | > echo "--------------" | |
50 |
> hg merge -y --debug --traceback --tool=" |
|
50 | > hg merge -y --debug --traceback --tool="$PYTHON ../merge" | |
51 | > |
|
51 | > | |
52 | > echo "--------------" |
|
52 | > echo "--------------" | |
53 | > hg status -camC -X rev |
|
53 | > hg status -camC -X rev | |
@@ -90,18 +90,18 b' args:' | |||||
90 | preserving rev for resolve of rev |
|
90 | preserving rev for resolve of rev | |
91 | starting 4 threads for background file closing (?) |
|
91 | starting 4 threads for background file closing (?) | |
92 | b: remote copied from a -> m (premerge) |
|
92 | b: remote copied from a -> m (premerge) | |
93 |
picked tool ' |
|
93 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
94 | merging a and b to b |
|
94 | merging a and b to b | |
95 | my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
|
95 | my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 | |
96 | premerge successful |
|
96 | premerge successful | |
97 | rev: versions differ -> m (premerge) |
|
97 | rev: versions differ -> m (premerge) | |
98 |
picked tool ' |
|
98 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
99 | merging rev |
|
99 | merging rev | |
100 | my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
100 | my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
101 | rev: versions differ -> m (merge) |
|
101 | rev: versions differ -> m (merge) | |
102 |
picked tool ' |
|
102 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
103 | my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
103 | my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
104 |
launching merge tool: |
|
104 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
105 | merge tool returned: 0 |
|
105 | merge tool returned: 0 | |
106 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
106 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
107 | (branch merge, don't forget to commit) |
|
107 | (branch merge, don't forget to commit) | |
@@ -130,18 +130,18 b' args:' | |||||
130 | a: remote is newer -> g |
|
130 | a: remote is newer -> g | |
131 | getting a |
|
131 | getting a | |
132 | b: local copied/moved from a -> m (premerge) |
|
132 | b: local copied/moved from a -> m (premerge) | |
133 |
picked tool ' |
|
133 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
134 | merging b and a to b |
|
134 | merging b and a to b | |
135 | my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
135 | my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 | |
136 | premerge successful |
|
136 | premerge successful | |
137 | rev: versions differ -> m (premerge) |
|
137 | rev: versions differ -> m (premerge) | |
138 |
picked tool ' |
|
138 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
139 | merging rev |
|
139 | merging rev | |
140 | my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
140 | my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
141 | rev: versions differ -> m (merge) |
|
141 | rev: versions differ -> m (merge) | |
142 |
picked tool ' |
|
142 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
143 | my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
143 | my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
144 |
launching merge tool: |
|
144 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
145 | merge tool returned: 0 |
|
145 | merge tool returned: 0 | |
146 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
146 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
147 | (branch merge, don't forget to commit) |
|
147 | (branch merge, don't forget to commit) | |
@@ -170,18 +170,18 b' args:' | |||||
170 | removing a |
|
170 | removing a | |
171 | starting 4 threads for background file closing (?) |
|
171 | starting 4 threads for background file closing (?) | |
172 | b: remote moved from a -> m (premerge) |
|
172 | b: remote moved from a -> m (premerge) | |
173 |
picked tool ' |
|
173 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
174 | merging a and b to b |
|
174 | merging a and b to b | |
175 | my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
|
175 | my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 | |
176 | premerge successful |
|
176 | premerge successful | |
177 | rev: versions differ -> m (premerge) |
|
177 | rev: versions differ -> m (premerge) | |
178 |
picked tool ' |
|
178 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
179 | merging rev |
|
179 | merging rev | |
180 | my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
180 | my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 | |
181 | rev: versions differ -> m (merge) |
|
181 | rev: versions differ -> m (merge) | |
182 |
picked tool ' |
|
182 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
183 | my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
183 | my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 | |
184 |
launching merge tool: |
|
184 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
185 | merge tool returned: 0 |
|
185 | merge tool returned: 0 | |
186 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
186 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
187 | (branch merge, don't forget to commit) |
|
187 | (branch merge, don't forget to commit) | |
@@ -208,18 +208,18 b' args:' | |||||
208 | preserving rev for resolve of rev |
|
208 | preserving rev for resolve of rev | |
209 | starting 4 threads for background file closing (?) |
|
209 | starting 4 threads for background file closing (?) | |
210 | b: local copied/moved from a -> m (premerge) |
|
210 | b: local copied/moved from a -> m (premerge) | |
211 |
picked tool ' |
|
211 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
212 | merging b and a to b |
|
212 | merging b and a to b | |
213 | my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
213 | my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 | |
214 | premerge successful |
|
214 | premerge successful | |
215 | rev: versions differ -> m (premerge) |
|
215 | rev: versions differ -> m (premerge) | |
216 |
picked tool ' |
|
216 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
217 | merging rev |
|
217 | merging rev | |
218 | my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
218 | my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
219 | rev: versions differ -> m (merge) |
|
219 | rev: versions differ -> m (merge) | |
220 |
picked tool ' |
|
220 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
221 | my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
221 | my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
222 |
launching merge tool: |
|
222 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
223 | merge tool returned: 0 |
|
223 | merge tool returned: 0 | |
224 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
224 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
225 | (branch merge, don't forget to commit) |
|
225 | (branch merge, don't forget to commit) | |
@@ -246,13 +246,13 b' args:' | |||||
246 | b: remote created -> g |
|
246 | b: remote created -> g | |
247 | getting b |
|
247 | getting b | |
248 | rev: versions differ -> m (premerge) |
|
248 | rev: versions differ -> m (premerge) | |
249 |
picked tool ' |
|
249 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
250 | merging rev |
|
250 | merging rev | |
251 | my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
251 | my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
252 | rev: versions differ -> m (merge) |
|
252 | rev: versions differ -> m (merge) | |
253 |
picked tool ' |
|
253 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
254 | my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
254 | my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
255 |
launching merge tool: |
|
255 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
256 | merge tool returned: 0 |
|
256 | merge tool returned: 0 | |
257 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
257 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
258 | (branch merge, don't forget to commit) |
|
258 | (branch merge, don't forget to commit) | |
@@ -278,13 +278,13 b' args:' | |||||
278 | preserving rev for resolve of rev |
|
278 | preserving rev for resolve of rev | |
279 | starting 4 threads for background file closing (?) |
|
279 | starting 4 threads for background file closing (?) | |
280 | rev: versions differ -> m (premerge) |
|
280 | rev: versions differ -> m (premerge) | |
281 |
picked tool ' |
|
281 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
282 | merging rev |
|
282 | merging rev | |
283 | my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
283 | my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 | |
284 | rev: versions differ -> m (merge) |
|
284 | rev: versions differ -> m (merge) | |
285 |
picked tool ' |
|
285 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
286 | my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
286 | my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 | |
287 |
launching merge tool: |
|
287 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
288 | merge tool returned: 0 |
|
288 | merge tool returned: 0 | |
289 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
289 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
290 | (branch merge, don't forget to commit) |
|
290 | (branch merge, don't forget to commit) | |
@@ -313,13 +313,13 b' args:' | |||||
313 | b: remote created -> g |
|
313 | b: remote created -> g | |
314 | getting b |
|
314 | getting b | |
315 | rev: versions differ -> m (premerge) |
|
315 | rev: versions differ -> m (premerge) | |
316 |
picked tool ' |
|
316 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
317 | merging rev |
|
317 | merging rev | |
318 | my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
318 | my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 | |
319 | rev: versions differ -> m (merge) |
|
319 | rev: versions differ -> m (merge) | |
320 |
picked tool ' |
|
320 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
321 | my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
321 | my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 | |
322 |
launching merge tool: |
|
322 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
323 | merge tool returned: 0 |
|
323 | merge tool returned: 0 | |
324 | 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
|
324 | 1 files updated, 1 files merged, 1 files removed, 0 files unresolved | |
325 | (branch merge, don't forget to commit) |
|
325 | (branch merge, don't forget to commit) | |
@@ -344,13 +344,13 b' args:' | |||||
344 | preserving rev for resolve of rev |
|
344 | preserving rev for resolve of rev | |
345 | starting 4 threads for background file closing (?) |
|
345 | starting 4 threads for background file closing (?) | |
346 | rev: versions differ -> m (premerge) |
|
346 | rev: versions differ -> m (premerge) | |
347 |
picked tool ' |
|
347 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
348 | merging rev |
|
348 | merging rev | |
349 | my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
349 | my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 | |
350 | rev: versions differ -> m (merge) |
|
350 | rev: versions differ -> m (merge) | |
351 |
picked tool ' |
|
351 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
352 | my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
352 | my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 | |
353 |
launching merge tool: |
|
353 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
354 | merge tool returned: 0 |
|
354 | merge tool returned: 0 | |
355 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
355 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
356 | (branch merge, don't forget to commit) |
|
356 | (branch merge, don't forget to commit) | |
@@ -373,22 +373,22 b' args:' | |||||
373 | preserving rev for resolve of rev |
|
373 | preserving rev for resolve of rev | |
374 | starting 4 threads for background file closing (?) |
|
374 | starting 4 threads for background file closing (?) | |
375 | b: both renamed from a -> m (premerge) |
|
375 | b: both renamed from a -> m (premerge) | |
376 |
picked tool ' |
|
376 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
377 | merging b |
|
377 | merging b | |
378 | my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
|
378 | my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 | |
379 | rev: versions differ -> m (premerge) |
|
379 | rev: versions differ -> m (premerge) | |
380 |
picked tool ' |
|
380 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
381 | merging rev |
|
381 | merging rev | |
382 | my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
382 | my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 | |
383 | b: both renamed from a -> m (merge) |
|
383 | b: both renamed from a -> m (merge) | |
384 |
picked tool ' |
|
384 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
385 | my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
|
385 | my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 | |
386 |
launching merge tool: |
|
386 | launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) | |
387 | merge tool returned: 0 |
|
387 | merge tool returned: 0 | |
388 | rev: versions differ -> m (merge) |
|
388 | rev: versions differ -> m (merge) | |
389 |
picked tool ' |
|
389 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
390 | my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
390 | my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 | |
391 |
launching merge tool: |
|
391 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
392 | merge tool returned: 0 |
|
392 | merge tool returned: 0 | |
393 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
393 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
394 | (branch merge, don't forget to commit) |
|
394 | (branch merge, don't forget to commit) | |
@@ -423,13 +423,13 b' m "um a c" "um x c" " " "10 do merg' | |||||
423 | c: remote created -> g |
|
423 | c: remote created -> g | |
424 | getting c |
|
424 | getting c | |
425 | rev: versions differ -> m (premerge) |
|
425 | rev: versions differ -> m (premerge) | |
426 |
picked tool ' |
|
426 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
427 | merging rev |
|
427 | merging rev | |
428 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
|
428 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | |
429 | rev: versions differ -> m (merge) |
|
429 | rev: versions differ -> m (merge) | |
430 |
picked tool ' |
|
430 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
431 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
|
431 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | |
432 |
launching merge tool: |
|
432 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
433 | merge tool returned: 0 |
|
433 | merge tool returned: 0 | |
434 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
434 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
435 | (branch merge, don't forget to commit) |
|
435 | (branch merge, don't forget to commit) | |
@@ -453,22 +453,22 b' m "um a c" "um x c" " " "10 do merg' | |||||
453 | preserving rev for resolve of rev |
|
453 | preserving rev for resolve of rev | |
454 | starting 4 threads for background file closing (?) |
|
454 | starting 4 threads for background file closing (?) | |
455 | b: both created -> m (premerge) |
|
455 | b: both created -> m (premerge) | |
456 |
picked tool ' |
|
456 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
457 | merging b |
|
457 | merging b | |
458 | my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
|
458 | my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 | |
459 | rev: versions differ -> m (premerge) |
|
459 | rev: versions differ -> m (premerge) | |
460 |
picked tool ' |
|
460 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
461 | merging rev |
|
461 | merging rev | |
462 | my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
|
462 | my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 | |
463 | b: both created -> m (merge) |
|
463 | b: both created -> m (merge) | |
464 |
picked tool ' |
|
464 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
465 | my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
|
465 | my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 | |
466 |
launching merge tool: |
|
466 | launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) | |
467 | merge tool returned: 0 |
|
467 | merge tool returned: 0 | |
468 | rev: versions differ -> m (merge) |
|
468 | rev: versions differ -> m (merge) | |
469 |
picked tool ' |
|
469 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
470 | my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
|
470 | my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 | |
471 |
launching merge tool: |
|
471 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
472 | merge tool returned: 0 |
|
472 | merge tool returned: 0 | |
473 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
473 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
474 | (branch merge, don't forget to commit) |
|
474 | (branch merge, don't forget to commit) | |
@@ -494,22 +494,22 b' m "um a c" "um x c" " " "10 do merg' | |||||
494 | removing a |
|
494 | removing a | |
495 | starting 4 threads for background file closing (?) |
|
495 | starting 4 threads for background file closing (?) | |
496 | b: both created -> m (premerge) |
|
496 | b: both created -> m (premerge) | |
497 |
picked tool ' |
|
497 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
498 | merging b |
|
498 | merging b | |
499 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
499 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | |
500 | rev: versions differ -> m (premerge) |
|
500 | rev: versions differ -> m (premerge) | |
501 |
picked tool ' |
|
501 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
502 | merging rev |
|
502 | merging rev | |
503 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
503 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | |
504 | b: both created -> m (merge) |
|
504 | b: both created -> m (merge) | |
505 |
picked tool ' |
|
505 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
506 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
506 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | |
507 |
launching merge tool: |
|
507 | launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) | |
508 | merge tool returned: 0 |
|
508 | merge tool returned: 0 | |
509 | rev: versions differ -> m (merge) |
|
509 | rev: versions differ -> m (merge) | |
510 |
picked tool ' |
|
510 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
511 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
511 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | |
512 |
launching merge tool: |
|
512 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
513 | merge tool returned: 0 |
|
513 | merge tool returned: 0 | |
514 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
|
514 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | |
515 | (branch merge, don't forget to commit) |
|
515 | (branch merge, don't forget to commit) | |
@@ -533,22 +533,22 b' m "um a c" "um x c" " " "10 do merg' | |||||
533 | a: remote is newer -> g |
|
533 | a: remote is newer -> g | |
534 | getting a |
|
534 | getting a | |
535 | b: both created -> m (premerge) |
|
535 | b: both created -> m (premerge) | |
536 |
picked tool ' |
|
536 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
537 | merging b |
|
537 | merging b | |
538 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
538 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | |
539 | rev: versions differ -> m (premerge) |
|
539 | rev: versions differ -> m (premerge) | |
540 |
picked tool ' |
|
540 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
541 | merging rev |
|
541 | merging rev | |
542 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
542 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | |
543 | b: both created -> m (merge) |
|
543 | b: both created -> m (merge) | |
544 |
picked tool ' |
|
544 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
545 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
545 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | |
546 |
launching merge tool: |
|
546 | launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) | |
547 | merge tool returned: 0 |
|
547 | merge tool returned: 0 | |
548 | rev: versions differ -> m (merge) |
|
548 | rev: versions differ -> m (merge) | |
549 |
picked tool ' |
|
549 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
550 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
550 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | |
551 |
launching merge tool: |
|
551 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
552 | merge tool returned: 0 |
|
552 | merge tool returned: 0 | |
553 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
553 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
554 | (branch merge, don't forget to commit) |
|
554 | (branch merge, don't forget to commit) | |
@@ -574,22 +574,22 b' m "um a c" "um x c" " " "10 do merg' | |||||
574 | removing a |
|
574 | removing a | |
575 | starting 4 threads for background file closing (?) |
|
575 | starting 4 threads for background file closing (?) | |
576 | b: both created -> m (premerge) |
|
576 | b: both created -> m (premerge) | |
577 |
picked tool ' |
|
577 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
578 | merging b |
|
578 | merging b | |
579 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
579 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | |
580 | rev: versions differ -> m (premerge) |
|
580 | rev: versions differ -> m (premerge) | |
581 |
picked tool ' |
|
581 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
582 | merging rev |
|
582 | merging rev | |
583 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
583 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | |
584 | b: both created -> m (merge) |
|
584 | b: both created -> m (merge) | |
585 |
picked tool ' |
|
585 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
586 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
586 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | |
587 |
launching merge tool: |
|
587 | launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) | |
588 | merge tool returned: 0 |
|
588 | merge tool returned: 0 | |
589 | rev: versions differ -> m (merge) |
|
589 | rev: versions differ -> m (merge) | |
590 |
picked tool ' |
|
590 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
591 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
591 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | |
592 |
launching merge tool: |
|
592 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
593 | merge tool returned: 0 |
|
593 | merge tool returned: 0 | |
594 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
|
594 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | |
595 | (branch merge, don't forget to commit) |
|
595 | (branch merge, don't forget to commit) | |
@@ -613,22 +613,22 b' m "um a c" "um x c" " " "10 do merg' | |||||
613 | a: remote is newer -> g |
|
613 | a: remote is newer -> g | |
614 | getting a |
|
614 | getting a | |
615 | b: both created -> m (premerge) |
|
615 | b: both created -> m (premerge) | |
616 |
picked tool ' |
|
616 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
617 | merging b |
|
617 | merging b | |
618 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
618 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | |
619 | rev: versions differ -> m (premerge) |
|
619 | rev: versions differ -> m (premerge) | |
620 |
picked tool ' |
|
620 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
621 | merging rev |
|
621 | merging rev | |
622 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
622 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | |
623 | b: both created -> m (merge) |
|
623 | b: both created -> m (merge) | |
624 |
picked tool ' |
|
624 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
625 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
625 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | |
626 |
launching merge tool: |
|
626 | launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) | |
627 | merge tool returned: 0 |
|
627 | merge tool returned: 0 | |
628 | rev: versions differ -> m (merge) |
|
628 | rev: versions differ -> m (merge) | |
629 |
picked tool ' |
|
629 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
630 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
630 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | |
631 |
launching merge tool: |
|
631 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
632 | merge tool returned: 0 |
|
632 | merge tool returned: 0 | |
633 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
633 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
634 | (branch merge, don't forget to commit) |
|
634 | (branch merge, don't forget to commit) | |
@@ -652,22 +652,22 b' m "um a c" "um x c" " " "10 do merg' | |||||
652 | preserving rev for resolve of rev |
|
652 | preserving rev for resolve of rev | |
653 | starting 4 threads for background file closing (?) |
|
653 | starting 4 threads for background file closing (?) | |
654 | b: both created -> m (premerge) |
|
654 | b: both created -> m (premerge) | |
655 |
picked tool ' |
|
655 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
656 | merging b |
|
656 | merging b | |
657 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
|
657 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 | |
658 | rev: versions differ -> m (premerge) |
|
658 | rev: versions differ -> m (premerge) | |
659 |
picked tool ' |
|
659 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
660 | merging rev |
|
660 | merging rev | |
661 | my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
661 | my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
662 | b: both created -> m (merge) |
|
662 | b: both created -> m (merge) | |
663 |
picked tool ' |
|
663 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
664 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
|
664 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 | |
665 |
launching merge tool: |
|
665 | launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) | |
666 | merge tool returned: 0 |
|
666 | merge tool returned: 0 | |
667 | rev: versions differ -> m (merge) |
|
667 | rev: versions differ -> m (merge) | |
668 |
picked tool ' |
|
668 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
669 | my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
669 | my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
670 |
launching merge tool: |
|
670 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
671 | merge tool returned: 0 |
|
671 | merge tool returned: 0 | |
672 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
672 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
673 | (branch merge, don't forget to commit) |
|
673 | (branch merge, don't forget to commit) | |
@@ -695,22 +695,22 b' m "um a c" "um x c" " " "10 do merg' | |||||
695 | other [merge rev] changed a which local [working copy] deleted |
|
695 | other [merge rev] changed a which local [working copy] deleted | |
696 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
696 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
697 | b: both created -> m (premerge) |
|
697 | b: both created -> m (premerge) | |
698 |
picked tool ' |
|
698 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
699 | merging b |
|
699 | merging b | |
700 | my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
|
700 | my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 | |
701 | rev: versions differ -> m (premerge) |
|
701 | rev: versions differ -> m (premerge) | |
702 |
picked tool ' |
|
702 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
703 | merging rev |
|
703 | merging rev | |
704 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
704 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 | |
705 | b: both created -> m (merge) |
|
705 | b: both created -> m (merge) | |
706 |
picked tool ' |
|
706 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
707 | my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
|
707 | my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 | |
708 |
launching merge tool: |
|
708 | launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) | |
709 | merge tool returned: 0 |
|
709 | merge tool returned: 0 | |
710 | rev: versions differ -> m (merge) |
|
710 | rev: versions differ -> m (merge) | |
711 |
picked tool ' |
|
711 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
712 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
712 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 | |
713 |
launching merge tool: |
|
713 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
714 | merge tool returned: 0 |
|
714 | merge tool returned: 0 | |
715 | 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
|
715 | 0 files updated, 2 files merged, 0 files removed, 1 files unresolved | |
716 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
716 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
@@ -740,22 +740,22 b' m "um a c" "um x c" " " "10 do merg' | |||||
740 | local [working copy] changed a which other [merge rev] deleted |
|
740 | local [working copy] changed a which other [merge rev] deleted | |
741 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
741 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
742 | b: both created -> m (premerge) |
|
742 | b: both created -> m (premerge) | |
743 |
picked tool ' |
|
743 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
744 | merging b |
|
744 | merging b | |
745 | my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
|
745 | my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 | |
746 | rev: versions differ -> m (premerge) |
|
746 | rev: versions differ -> m (premerge) | |
747 |
picked tool ' |
|
747 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
748 | merging rev |
|
748 | merging rev | |
749 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
749 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 | |
750 | b: both created -> m (merge) |
|
750 | b: both created -> m (merge) | |
751 |
picked tool ' |
|
751 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
752 | my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
|
752 | my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 | |
753 |
launching merge tool: |
|
753 | launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) | |
754 | merge tool returned: 0 |
|
754 | merge tool returned: 0 | |
755 | rev: versions differ -> m (merge) |
|
755 | rev: versions differ -> m (merge) | |
756 |
picked tool ' |
|
756 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
757 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
757 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 | |
758 |
launching merge tool: |
|
758 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
759 | merge tool returned: 0 |
|
759 | merge tool returned: 0 | |
760 | 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
|
760 | 0 files updated, 2 files merged, 0 files removed, 1 files unresolved | |
761 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
761 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
@@ -784,22 +784,22 b' m "um a c" "um x c" " " "10 do merg' | |||||
784 | removing a |
|
784 | removing a | |
785 | starting 4 threads for background file closing (?) |
|
785 | starting 4 threads for background file closing (?) | |
786 | b: remote moved from a -> m (premerge) |
|
786 | b: remote moved from a -> m (premerge) | |
787 |
picked tool ' |
|
787 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
788 | merging a and b to b |
|
788 | merging a and b to b | |
789 | my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
|
789 | my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 | |
790 | rev: versions differ -> m (premerge) |
|
790 | rev: versions differ -> m (premerge) | |
791 |
picked tool ' |
|
791 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
792 | merging rev |
|
792 | merging rev | |
793 | my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
793 | my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 | |
794 | b: remote moved from a -> m (merge) |
|
794 | b: remote moved from a -> m (merge) | |
795 |
picked tool ' |
|
795 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
796 | my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
|
796 | my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 | |
797 |
launching merge tool: |
|
797 | launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) | |
798 | merge tool returned: 0 |
|
798 | merge tool returned: 0 | |
799 | rev: versions differ -> m (merge) |
|
799 | rev: versions differ -> m (merge) | |
800 |
picked tool ' |
|
800 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
801 | my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
801 | my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 | |
802 |
launching merge tool: |
|
802 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
803 | merge tool returned: 0 |
|
803 | merge tool returned: 0 | |
804 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
804 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
805 | (branch merge, don't forget to commit) |
|
805 | (branch merge, don't forget to commit) | |
@@ -826,22 +826,22 b' m "um a c" "um x c" " " "10 do merg' | |||||
826 | preserving rev for resolve of rev |
|
826 | preserving rev for resolve of rev | |
827 | starting 4 threads for background file closing (?) |
|
827 | starting 4 threads for background file closing (?) | |
828 | b: local copied/moved from a -> m (premerge) |
|
828 | b: local copied/moved from a -> m (premerge) | |
829 |
picked tool ' |
|
829 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
830 | merging b and a to b |
|
830 | merging b and a to b | |
831 | my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
831 | my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 | |
832 | rev: versions differ -> m (premerge) |
|
832 | rev: versions differ -> m (premerge) | |
833 |
picked tool ' |
|
833 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
834 | merging rev |
|
834 | merging rev | |
835 | my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
835 | my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
836 | b: local copied/moved from a -> m (merge) |
|
836 | b: local copied/moved from a -> m (merge) | |
837 |
picked tool ' |
|
837 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
838 | my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
838 | my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 | |
839 |
launching merge tool: |
|
839 | launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) | |
840 | merge tool returned: 0 |
|
840 | merge tool returned: 0 | |
841 | rev: versions differ -> m (merge) |
|
841 | rev: versions differ -> m (merge) | |
842 |
picked tool ' |
|
842 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
843 | my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
843 | my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
844 |
launching merge tool: |
|
844 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
845 | merge tool returned: 0 |
|
845 | merge tool returned: 0 | |
846 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
846 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
847 | (branch merge, don't forget to commit) |
|
847 | (branch merge, don't forget to commit) | |
@@ -874,18 +874,18 b' m "nm a b" "um x a" " " "22 get a, ' | |||||
874 | c: remote created -> g |
|
874 | c: remote created -> g | |
875 | getting c |
|
875 | getting c | |
876 | b: local copied/moved from a -> m (premerge) |
|
876 | b: local copied/moved from a -> m (premerge) | |
877 |
picked tool ' |
|
877 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
878 | merging b and a to b |
|
878 | merging b and a to b | |
879 | my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
|
879 | my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 | |
880 | premerge successful |
|
880 | premerge successful | |
881 | rev: versions differ -> m (premerge) |
|
881 | rev: versions differ -> m (premerge) | |
882 |
picked tool ' |
|
882 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
883 | merging rev |
|
883 | merging rev | |
884 | my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
|
884 | my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 | |
885 | rev: versions differ -> m (merge) |
|
885 | rev: versions differ -> m (merge) | |
886 |
picked tool ' |
|
886 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
887 | my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
|
887 | my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 | |
888 |
launching merge tool: |
|
888 | launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) | |
889 | merge tool returned: 0 |
|
889 | merge tool returned: 0 | |
890 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
890 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
891 | (branch merge, don't forget to commit) |
|
891 | (branch merge, don't forget to commit) |
@@ -3065,14 +3065,14 b' no crash by empty group "()" while optim' | |||||
3065 | test that chained `or` operations never eat up stack (issue4624) |
|
3065 | test that chained `or` operations never eat up stack (issue4624) | |
3066 | (uses `0:1` instead of `0` to avoid future optimization of trivial revisions) |
|
3066 | (uses `0:1` instead of `0` to avoid future optimization of trivial revisions) | |
3067 |
|
3067 | |||
3068 |
$ hg log -T '{rev}\n' -r ` |
|
3068 | $ hg log -T '{rev}\n' -r `$PYTHON -c "print '+'.join(['0:1'] * 500)"` | |
3069 | 0 |
|
3069 | 0 | |
3070 | 1 |
|
3070 | 1 | |
3071 |
|
3071 | |||
3072 | test that repeated `-r` options never eat up stack (issue4565) |
|
3072 | test that repeated `-r` options never eat up stack (issue4565) | |
3073 | (uses `-r 0::1` to avoid possible optimization at old-style parser) |
|
3073 | (uses `-r 0::1` to avoid possible optimization at old-style parser) | |
3074 |
|
3074 | |||
3075 |
$ hg log -T '{rev}\n' ` |
|
3075 | $ hg log -T '{rev}\n' `$PYTHON -c "for i in xrange(500): print '-r 0::1 ',"` | |
3076 | 0 |
|
3076 | 0 | |
3077 | 1 |
|
3077 | 1 | |
3078 |
|
3078 |
@@ -44,21 +44,21 b' configure for serving' | |||||
44 |
|
44 | |||
45 | repo not found error |
|
45 | repo not found error | |
46 |
|
46 | |||
47 |
$ hg clone -e " |
|
47 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local | |
48 | remote: abort: repository nonexistent not found! |
|
48 | remote: abort: repository nonexistent not found! | |
49 | abort: no suitable response from remote hg! |
|
49 | abort: no suitable response from remote hg! | |
50 | [255] |
|
50 | [255] | |
51 |
|
51 | |||
52 | non-existent absolute path |
|
52 | non-existent absolute path | |
53 |
|
53 | |||
54 |
$ hg clone -e " |
|
54 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy//`pwd`/nonexistent local | |
55 | remote: abort: repository /$TESTTMP/nonexistent not found! |
|
55 | remote: abort: repository /$TESTTMP/nonexistent not found! | |
56 | abort: no suitable response from remote hg! |
|
56 | abort: no suitable response from remote hg! | |
57 | [255] |
|
57 | [255] | |
58 |
|
58 | |||
59 | clone remote via stream |
|
59 | clone remote via stream | |
60 |
|
60 | |||
61 |
$ hg clone -e " |
|
61 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream | |
62 | streaming all changes |
|
62 | streaming all changes | |
63 | 4 files to transfer, 602 bytes of data |
|
63 | 4 files to transfer, 602 bytes of data | |
64 | transferred 602 bytes in * seconds (*) (glob) |
|
64 | transferred 602 bytes in * seconds (*) (glob) | |
@@ -80,7 +80,7 b' clone remote via stream' | |||||
80 | clone bookmarks via stream |
|
80 | clone bookmarks via stream | |
81 |
|
81 | |||
82 | $ hg -R local-stream book mybook |
|
82 | $ hg -R local-stream book mybook | |
83 |
$ hg clone -e " |
|
83 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/local-stream stream2 | |
84 | streaming all changes |
|
84 | streaming all changes | |
85 | 4 files to transfer, 602 bytes of data |
|
85 | 4 files to transfer, 602 bytes of data | |
86 | transferred 602 bytes in * seconds (*) (glob) |
|
86 | transferred 602 bytes in * seconds (*) (glob) | |
@@ -96,7 +96,7 b' clone bookmarks via stream' | |||||
96 |
|
96 | |||
97 | clone remote via pull |
|
97 | clone remote via pull | |
98 |
|
98 | |||
99 |
$ hg clone -e " |
|
99 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local | |
100 | requesting all changes |
|
100 | requesting all changes | |
101 | adding changesets |
|
101 | adding changesets | |
102 | adding manifests |
|
102 | adding manifests | |
@@ -123,14 +123,14 b' empty default pull' | |||||
123 |
|
123 | |||
124 | $ hg paths |
|
124 | $ hg paths | |
125 | default = ssh://user@dummy/remote |
|
125 | default = ssh://user@dummy/remote | |
126 |
$ hg pull -e " |
|
126 | $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" | |
127 | pulling from ssh://user@dummy/remote |
|
127 | pulling from ssh://user@dummy/remote | |
128 | searching for changes |
|
128 | searching for changes | |
129 | no changes found |
|
129 | no changes found | |
130 |
|
130 | |||
131 | pull from wrong ssh URL |
|
131 | pull from wrong ssh URL | |
132 |
|
132 | |||
133 |
$ hg pull -e " |
|
133 | $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/doesnotexist | |
134 | pulling from ssh://user@dummy/doesnotexist |
|
134 | pulling from ssh://user@dummy/doesnotexist | |
135 | remote: abort: repository doesnotexist not found! |
|
135 | remote: abort: repository doesnotexist not found! | |
136 | abort: no suitable response from remote hg! |
|
136 | abort: no suitable response from remote hg! | |
@@ -162,7 +162,7 b' find outgoing' | |||||
162 |
|
162 | |||
163 | find incoming on the remote side |
|
163 | find incoming on the remote side | |
164 |
|
164 | |||
165 |
$ hg incoming -R ../remote -e " |
|
165 | $ hg incoming -R ../remote -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/local | |
166 | comparing with ssh://user@dummy/local |
|
166 | comparing with ssh://user@dummy/local | |
167 | searching for changes |
|
167 | searching for changes | |
168 | changeset: 3:a28a9d1a809c |
|
168 | changeset: 3:a28a9d1a809c | |
@@ -175,7 +175,7 b' find incoming on the remote side' | |||||
175 |
|
175 | |||
176 | find incoming on the remote side (using absolute path) |
|
176 | find incoming on the remote side (using absolute path) | |
177 |
|
177 | |||
178 |
$ hg incoming -R ../remote -e " |
|
178 | $ hg incoming -R ../remote -e "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/`pwd`" | |
179 | comparing with ssh://user@dummy/$TESTTMP/local |
|
179 | comparing with ssh://user@dummy/$TESTTMP/local | |
180 | searching for changes |
|
180 | searching for changes | |
181 | changeset: 3:a28a9d1a809c |
|
181 | changeset: 3:a28a9d1a809c | |
@@ -222,7 +222,7 b' check remote tip' | |||||
222 | test pushkeys and bookmarks |
|
222 | test pushkeys and bookmarks | |
223 |
|
223 | |||
224 | $ cd ../local |
|
224 | $ cd ../local | |
225 |
$ hg debugpushkey --config ui.ssh=" |
|
225 | $ hg debugpushkey --config ui.ssh="$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces | |
226 | bookmarks |
|
226 | bookmarks | |
227 | namespaces |
|
227 | namespaces | |
228 | phases |
|
228 | phases | |
@@ -237,7 +237,7 b' test pushkeys and bookmarks' | |||||
237 | no changes found |
|
237 | no changes found | |
238 | exporting bookmark foo |
|
238 | exporting bookmark foo | |
239 | [1] |
|
239 | [1] | |
240 |
$ hg debugpushkey --config ui.ssh=" |
|
240 | $ hg debugpushkey --config ui.ssh="$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote bookmarks | |
241 | foo 1160648e36cec0054048a7edc4110c6f84fde594 |
|
241 | foo 1160648e36cec0054048a7edc4110c6f84fde594 | |
242 | $ hg book -f foo |
|
242 | $ hg book -f foo | |
243 | $ hg push --traceback |
|
243 | $ hg push --traceback | |
@@ -307,7 +307,7 b' clone bookmarks' | |||||
307 | $ hg -R ../remote bookmark test |
|
307 | $ hg -R ../remote bookmark test | |
308 | $ hg -R ../remote bookmarks |
|
308 | $ hg -R ../remote bookmarks | |
309 | * test 4:6c0482d977a3 |
|
309 | * test 4:6c0482d977a3 | |
310 |
$ hg clone -e " |
|
310 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local-bookmarks | |
311 | requesting all changes |
|
311 | requesting all changes | |
312 | adding changesets |
|
312 | adding changesets | |
313 | adding manifests |
|
313 | adding manifests | |
@@ -334,21 +334,21 b' hide outer repo' | |||||
334 |
|
334 | |||
335 | Test remote paths with spaces (issue2983): |
|
335 | Test remote paths with spaces (issue2983): | |
336 |
|
336 | |||
337 |
$ hg init --ssh " |
|
337 | $ hg init --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" | |
338 | $ touch "$TESTTMP/a repo/test" |
|
338 | $ touch "$TESTTMP/a repo/test" | |
339 | $ hg -R 'a repo' commit -A -m "test" |
|
339 | $ hg -R 'a repo' commit -A -m "test" | |
340 | adding test |
|
340 | adding test | |
341 | $ hg -R 'a repo' tag tag |
|
341 | $ hg -R 'a repo' tag tag | |
342 |
$ hg id --ssh " |
|
342 | $ hg id --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" | |
343 | 73649e48688a |
|
343 | 73649e48688a | |
344 |
|
344 | |||
345 |
$ hg id --ssh " |
|
345 | $ hg id --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo#noNoNO" | |
346 | abort: unknown revision 'noNoNO'! |
|
346 | abort: unknown revision 'noNoNO'! | |
347 | [255] |
|
347 | [255] | |
348 |
|
348 | |||
349 | Test (non-)escaping of remote paths with spaces when cloning (issue3145): |
|
349 | Test (non-)escaping of remote paths with spaces when cloning (issue3145): | |
350 |
|
350 | |||
351 |
$ hg clone --ssh " |
|
351 | $ hg clone --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" | |
352 | destination directory: a repo |
|
352 | destination directory: a repo | |
353 | abort: destination 'a repo' is not empty |
|
353 | abort: destination 'a repo' is not empty | |
354 | [255] |
|
354 | [255] | |
@@ -526,11 +526,11 b' remote hook failure is attributed to rem' | |||||
526 |
|
526 | |||
527 | $ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc |
|
527 | $ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc | |
528 |
|
528 | |||
529 |
$ hg -q --config ui.ssh=" |
|
529 | $ hg -q --config ui.ssh="$PYTHON $TESTDIR/dummyssh" clone ssh://user@dummy/remote hookout | |
530 | $ cd hookout |
|
530 | $ cd hookout | |
531 | $ touch hookfailure |
|
531 | $ touch hookfailure | |
532 | $ hg -q commit -A -m 'remote hook failure' |
|
532 | $ hg -q commit -A -m 'remote hook failure' | |
533 |
$ hg --config ui.ssh=" |
|
533 | $ hg --config ui.ssh="$PYTHON $TESTDIR/dummyssh" push | |
534 | pushing to ssh://user@dummy/remote |
|
534 | pushing to ssh://user@dummy/remote | |
535 | searching for changes |
|
535 | searching for changes | |
536 | remote: adding changesets |
|
536 | remote: adding changesets | |
@@ -551,7 +551,7 b' abort during pull is properly reported a' | |||||
551 | > [extensions] |
|
551 | > [extensions] | |
552 | > crash = ${TESTDIR}/crashgetbundler.py |
|
552 | > crash = ${TESTDIR}/crashgetbundler.py | |
553 | > EOF |
|
553 | > EOF | |
554 |
$ hg --config ui.ssh=" |
|
554 | $ hg --config ui.ssh="$PYTHON $TESTDIR/dummyssh" pull | |
555 | pulling from ssh://user@dummy/remote |
|
555 | pulling from ssh://user@dummy/remote | |
556 | searching for changes |
|
556 | searching for changes | |
557 | adding changesets |
|
557 | adding changesets |
@@ -17,7 +17,7 b" creating 'remote' repo" | |||||
17 | clone remote via stream |
|
17 | clone remote via stream | |
18 |
|
18 | |||
19 | $ for i in 0 1 2 3 4 5 6 7 8; do |
|
19 | $ for i in 0 1 2 3 4 5 6 7 8; do | |
20 |
> hg clone -e " |
|
20 | > hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" --uncompressed -r "$i" ssh://user@dummy/remote test-"$i" | |
21 | > if cd test-"$i"; then |
|
21 | > if cd test-"$i"; then | |
22 | > hg verify |
|
22 | > hg verify | |
23 | > cd .. |
|
23 | > cd .. | |
@@ -139,7 +139,7 b' clone remote via stream' | |||||
139 | 4 files, 9 changesets, 7 total revisions |
|
139 | 4 files, 9 changesets, 7 total revisions | |
140 | $ cd .. |
|
140 | $ cd .. | |
141 | $ cd test-1 |
|
141 | $ cd test-1 | |
142 |
$ hg pull -e " |
|
142 | $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" -r 4 ssh://user@dummy/remote | |
143 | pulling from ssh://user@dummy/remote |
|
143 | pulling from ssh://user@dummy/remote | |
144 | searching for changes |
|
144 | searching for changes | |
145 | adding changesets |
|
145 | adding changesets | |
@@ -153,7 +153,7 b' clone remote via stream' | |||||
153 | crosschecking files in changesets and manifests |
|
153 | crosschecking files in changesets and manifests | |
154 | checking files |
|
154 | checking files | |
155 | 1 files, 3 changesets, 2 total revisions |
|
155 | 1 files, 3 changesets, 2 total revisions | |
156 |
$ hg pull -e " |
|
156 | $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote | |
157 | pulling from ssh://user@dummy/remote |
|
157 | pulling from ssh://user@dummy/remote | |
158 | searching for changes |
|
158 | searching for changes | |
159 | adding changesets |
|
159 | adding changesets | |
@@ -163,7 +163,7 b' clone remote via stream' | |||||
163 | (run 'hg update' to get a working copy) |
|
163 | (run 'hg update' to get a working copy) | |
164 | $ cd .. |
|
164 | $ cd .. | |
165 | $ cd test-2 |
|
165 | $ cd test-2 | |
166 |
$ hg pull -e " |
|
166 | $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" -r 5 ssh://user@dummy/remote | |
167 | pulling from ssh://user@dummy/remote |
|
167 | pulling from ssh://user@dummy/remote | |
168 | searching for changes |
|
168 | searching for changes | |
169 | adding changesets |
|
169 | adding changesets | |
@@ -177,7 +177,7 b' clone remote via stream' | |||||
177 | crosschecking files in changesets and manifests |
|
177 | crosschecking files in changesets and manifests | |
178 | checking files |
|
178 | checking files | |
179 | 1 files, 5 changesets, 3 total revisions |
|
179 | 1 files, 5 changesets, 3 total revisions | |
180 |
$ hg pull -e " |
|
180 | $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote | |
181 | pulling from ssh://user@dummy/remote |
|
181 | pulling from ssh://user@dummy/remote | |
182 | searching for changes |
|
182 | searching for changes | |
183 | adding changesets |
|
183 | adding changesets |
@@ -38,21 +38,21 b' configure for serving' | |||||
38 |
|
38 | |||
39 | repo not found error |
|
39 | repo not found error | |
40 |
|
40 | |||
41 |
$ hg clone -e " |
|
41 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local | |
42 | remote: abort: repository nonexistent not found! |
|
42 | remote: abort: repository nonexistent not found! | |
43 | abort: no suitable response from remote hg! |
|
43 | abort: no suitable response from remote hg! | |
44 | [255] |
|
44 | [255] | |
45 |
|
45 | |||
46 | non-existent absolute path |
|
46 | non-existent absolute path | |
47 |
|
47 | |||
48 |
$ hg clone -e " |
|
48 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/nonexistent local | |
49 | remote: abort: repository $TESTTMP/nonexistent not found! |
|
49 | remote: abort: repository $TESTTMP/nonexistent not found! | |
50 | abort: no suitable response from remote hg! |
|
50 | abort: no suitable response from remote hg! | |
51 | [255] |
|
51 | [255] | |
52 |
|
52 | |||
53 | clone remote via stream |
|
53 | clone remote via stream | |
54 |
|
54 | |||
55 |
$ hg clone -e " |
|
55 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream | |
56 | streaming all changes |
|
56 | streaming all changes | |
57 | 4 files to transfer, 602 bytes of data |
|
57 | 4 files to transfer, 602 bytes of data | |
58 | transferred 602 bytes in * seconds (*) (glob) |
|
58 | transferred 602 bytes in * seconds (*) (glob) | |
@@ -74,7 +74,7 b' clone remote via stream' | |||||
74 | clone bookmarks via stream |
|
74 | clone bookmarks via stream | |
75 |
|
75 | |||
76 | $ hg -R local-stream book mybook |
|
76 | $ hg -R local-stream book mybook | |
77 |
$ hg clone -e " |
|
77 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/local-stream stream2 | |
78 | streaming all changes |
|
78 | streaming all changes | |
79 | 4 files to transfer, 602 bytes of data |
|
79 | 4 files to transfer, 602 bytes of data | |
80 | transferred 602 bytes in * seconds (*) (glob) |
|
80 | transferred 602 bytes in * seconds (*) (glob) | |
@@ -90,7 +90,7 b' clone bookmarks via stream' | |||||
90 |
|
90 | |||
91 | clone remote via pull |
|
91 | clone remote via pull | |
92 |
|
92 | |||
93 |
$ hg clone -e " |
|
93 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local | |
94 | requesting all changes |
|
94 | requesting all changes | |
95 | adding changesets |
|
95 | adding changesets | |
96 | adding manifests |
|
96 | adding manifests | |
@@ -117,14 +117,14 b' empty default pull' | |||||
117 |
|
117 | |||
118 | $ hg paths |
|
118 | $ hg paths | |
119 | default = ssh://user@dummy/remote |
|
119 | default = ssh://user@dummy/remote | |
120 |
$ hg pull -e " |
|
120 | $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" | |
121 | pulling from ssh://user@dummy/remote |
|
121 | pulling from ssh://user@dummy/remote | |
122 | searching for changes |
|
122 | searching for changes | |
123 | no changes found |
|
123 | no changes found | |
124 |
|
124 | |||
125 | pull from wrong ssh URL |
|
125 | pull from wrong ssh URL | |
126 |
|
126 | |||
127 |
$ hg pull -e " |
|
127 | $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/doesnotexist | |
128 | pulling from ssh://user@dummy/doesnotexist |
|
128 | pulling from ssh://user@dummy/doesnotexist | |
129 | remote: abort: repository doesnotexist not found! |
|
129 | remote: abort: repository doesnotexist not found! | |
130 | abort: no suitable response from remote hg! |
|
130 | abort: no suitable response from remote hg! | |
@@ -156,7 +156,7 b' find outgoing' | |||||
156 |
|
156 | |||
157 | find incoming on the remote side |
|
157 | find incoming on the remote side | |
158 |
|
158 | |||
159 |
$ hg incoming -R ../remote -e " |
|
159 | $ hg incoming -R ../remote -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/local | |
160 | comparing with ssh://user@dummy/local |
|
160 | comparing with ssh://user@dummy/local | |
161 | searching for changes |
|
161 | searching for changes | |
162 | changeset: 3:a28a9d1a809c |
|
162 | changeset: 3:a28a9d1a809c | |
@@ -169,7 +169,7 b' find incoming on the remote side' | |||||
169 |
|
169 | |||
170 | find incoming on the remote side (using absolute path) |
|
170 | find incoming on the remote side (using absolute path) | |
171 |
|
171 | |||
172 |
$ hg incoming -R ../remote -e " |
|
172 | $ hg incoming -R ../remote -e "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/`pwd`" | |
173 | comparing with ssh://user@dummy/$TESTTMP/local |
|
173 | comparing with ssh://user@dummy/$TESTTMP/local | |
174 | searching for changes |
|
174 | searching for changes | |
175 | changeset: 3:a28a9d1a809c |
|
175 | changeset: 3:a28a9d1a809c | |
@@ -216,7 +216,7 b' check remote tip' | |||||
216 | test pushkeys and bookmarks |
|
216 | test pushkeys and bookmarks | |
217 |
|
217 | |||
218 | $ cd ../local |
|
218 | $ cd ../local | |
219 |
$ hg debugpushkey --config ui.ssh=" |
|
219 | $ hg debugpushkey --config ui.ssh="$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces | |
220 | bookmarks |
|
220 | bookmarks | |
221 | namespaces |
|
221 | namespaces | |
222 | phases |
|
222 | phases | |
@@ -231,7 +231,7 b' test pushkeys and bookmarks' | |||||
231 | no changes found |
|
231 | no changes found | |
232 | exporting bookmark foo |
|
232 | exporting bookmark foo | |
233 | [1] |
|
233 | [1] | |
234 |
$ hg debugpushkey --config ui.ssh=" |
|
234 | $ hg debugpushkey --config ui.ssh="$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote bookmarks | |
235 | foo 1160648e36cec0054048a7edc4110c6f84fde594 |
|
235 | foo 1160648e36cec0054048a7edc4110c6f84fde594 | |
236 | $ hg book -f foo |
|
236 | $ hg book -f foo | |
237 | $ hg push --traceback |
|
237 | $ hg push --traceback | |
@@ -311,7 +311,7 b' clone bookmarks' | |||||
311 | $ hg -R ../remote bookmark test |
|
311 | $ hg -R ../remote bookmark test | |
312 | $ hg -R ../remote bookmarks |
|
312 | $ hg -R ../remote bookmarks | |
313 | * test 4:6c0482d977a3 |
|
313 | * test 4:6c0482d977a3 | |
314 |
$ hg clone -e " |
|
314 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local-bookmarks | |
315 | requesting all changes |
|
315 | requesting all changes | |
316 | adding changesets |
|
316 | adding changesets | |
317 | adding manifests |
|
317 | adding manifests | |
@@ -338,21 +338,21 b' hide outer repo' | |||||
338 |
|
338 | |||
339 | Test remote paths with spaces (issue2983): |
|
339 | Test remote paths with spaces (issue2983): | |
340 |
|
340 | |||
341 |
$ hg init --ssh " |
|
341 | $ hg init --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" | |
342 | $ touch "$TESTTMP/a repo/test" |
|
342 | $ touch "$TESTTMP/a repo/test" | |
343 | $ hg -R 'a repo' commit -A -m "test" |
|
343 | $ hg -R 'a repo' commit -A -m "test" | |
344 | adding test |
|
344 | adding test | |
345 | $ hg -R 'a repo' tag tag |
|
345 | $ hg -R 'a repo' tag tag | |
346 |
$ hg id --ssh " |
|
346 | $ hg id --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" | |
347 | 73649e48688a |
|
347 | 73649e48688a | |
348 |
|
348 | |||
349 |
$ hg id --ssh " |
|
349 | $ hg id --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo#noNoNO" | |
350 | abort: unknown revision 'noNoNO'! |
|
350 | abort: unknown revision 'noNoNO'! | |
351 | [255] |
|
351 | [255] | |
352 |
|
352 | |||
353 | Test (non-)escaping of remote paths with spaces when cloning (issue3145): |
|
353 | Test (non-)escaping of remote paths with spaces when cloning (issue3145): | |
354 |
|
354 | |||
355 |
$ hg clone --ssh " |
|
355 | $ hg clone --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" | |
356 | destination directory: a repo |
|
356 | destination directory: a repo | |
357 | abort: destination 'a repo' is not empty |
|
357 | abort: destination 'a repo' is not empty | |
358 | [255] |
|
358 | [255] | |
@@ -543,11 +543,11 b' remote hook failure is attributed to rem' | |||||
543 |
|
543 | |||
544 | $ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc |
|
544 | $ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc | |
545 |
|
545 | |||
546 |
$ hg -q --config ui.ssh=" |
|
546 | $ hg -q --config ui.ssh="$PYTHON $TESTDIR/dummyssh" clone ssh://user@dummy/remote hookout | |
547 | $ cd hookout |
|
547 | $ cd hookout | |
548 | $ touch hookfailure |
|
548 | $ touch hookfailure | |
549 | $ hg -q commit -A -m 'remote hook failure' |
|
549 | $ hg -q commit -A -m 'remote hook failure' | |
550 |
$ hg --config ui.ssh=" |
|
550 | $ hg --config ui.ssh="$PYTHON $TESTDIR/dummyssh" push | |
551 | pushing to ssh://user@dummy/remote |
|
551 | pushing to ssh://user@dummy/remote | |
552 | searching for changes |
|
552 | searching for changes | |
553 | remote: adding changesets |
|
553 | remote: adding changesets | |
@@ -569,7 +569,7 b' abort during pull is properly reported a' | |||||
569 | > [extensions] |
|
569 | > [extensions] | |
570 | > crash = ${TESTDIR}/crashgetbundler.py |
|
570 | > crash = ${TESTDIR}/crashgetbundler.py | |
571 | > EOF |
|
571 | > EOF | |
572 |
$ hg --config ui.ssh=" |
|
572 | $ hg --config ui.ssh="$PYTHON $TESTDIR/dummyssh" pull | |
573 | pulling from ssh://user@dummy/remote |
|
573 | pulling from ssh://user@dummy/remote | |
574 | searching for changes |
|
574 | searching for changes | |
575 | remote: abort: this is an exercise |
|
575 | remote: abort: this is an exercise |
@@ -74,7 +74,7 b" subrepo debug for 'main' clone" | |||||
74 |
|
74 | |||
75 | subrepo paths with ssh urls |
|
75 | subrepo paths with ssh urls | |
76 |
|
76 | |||
77 |
$ hg clone -e " |
|
77 | $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/cloned sshclone | |
78 | requesting all changes |
|
78 | requesting all changes | |
79 | adding changesets |
|
79 | adding changesets | |
80 | adding manifests |
|
80 | adding manifests | |
@@ -89,7 +89,7 b' subrepo paths with ssh urls' | |||||
89 | added 1 changesets with 1 changes to 1 files |
|
89 | added 1 changesets with 1 changes to 1 files | |
90 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
90 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
91 |
|
91 | |||
92 |
$ hg -R sshclone push -e " |
|
92 | $ hg -R sshclone push -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/cloned | |
93 | pushing to ssh://user@dummy/$TESTTMP/cloned |
|
93 | pushing to ssh://user@dummy/$TESTTMP/cloned | |
94 | pushing subrepo sub to ssh://user@dummy/$TESTTMP/sub |
|
94 | pushing subrepo sub to ssh://user@dummy/$TESTTMP/sub | |
95 | searching for changes |
|
95 | searching for changes |
@@ -4,7 +4,7 b'' | |||||
4 | > [format] |
|
4 | > [format] | |
5 | > usegeneraldelta=yes |
|
5 | > usegeneraldelta=yes | |
6 | > [ui] |
|
6 | > [ui] | |
7 |
> ssh= |
|
7 | > ssh=$PYTHON "$TESTDIR/dummyssh" | |
8 | > EOF |
|
8 | > EOF | |
9 |
|
9 | |||
10 | Set up repo |
|
10 | Set up repo |
@@ -147,13 +147,13 b' HTTP without the httpheader capability:' | |||||
147 |
|
147 | |||
148 | SSH (try to exercise the ssh functionality with a dummy script): |
|
148 | SSH (try to exercise the ssh functionality with a dummy script): | |
149 |
|
149 | |||
150 |
$ hg debugwireargs --ssh " |
|
150 | $ hg debugwireargs --ssh "$PYTHON $TESTDIR/dummyssh" ssh://user@dummy/repo uno due tre quattro | |
151 | uno due tre quattro None |
|
151 | uno due tre quattro None | |
152 |
$ hg debugwireargs --ssh " |
|
152 | $ hg debugwireargs --ssh "$PYTHON $TESTDIR/dummyssh" ssh://user@dummy/repo eins zwei --four vier | |
153 | eins zwei None vier None |
|
153 | eins zwei None vier None | |
154 |
$ hg debugwireargs --ssh " |
|
154 | $ hg debugwireargs --ssh "$PYTHON $TESTDIR/dummyssh" ssh://user@dummy/repo eins zwei | |
155 | eins zwei None None None |
|
155 | eins zwei None None None | |
156 |
$ hg debugwireargs --ssh " |
|
156 | $ hg debugwireargs --ssh "$PYTHON $TESTDIR/dummyssh" ssh://user@dummy/repo eins zwei --five fuenf | |
157 | eins zwei None None None |
|
157 | eins zwei None None None | |
158 |
|
158 | |||
159 | Explicitly kill daemons to let the test exit on Windows |
|
159 | Explicitly kill daemons to let the test exit on Windows |
General Comments 0
You need to be logged in to leave comments.
Login now