##// END OF EJS Templates
push: don't treat bookmark as a found change...
Matt Mackall -
r16038:dad96e75 stable
parent child Browse files
Show More
@@ -4451,7 +4451,6 b' def push(ui, repo, dest=None, **opts):'
4451 ui.warn(_('updating bookmark %s failed!\n') % b)
4451 ui.warn(_('updating bookmark %s failed!\n') % b)
4452 if not result:
4452 if not result:
4453 result = 2
4453 result = 2
4454 result = 0
4455
4454
4456 return result
4455 return result
4457
4456
@@ -58,6 +58,7 b' export bookmark by name'
58 searching for changes
58 searching for changes
59 no changes found
59 no changes found
60 exporting bookmark W
60 exporting bookmark W
61 [1]
61 $ hg -R ../a bookmarks
62 $ hg -R ../a bookmarks
62 W -1:000000000000
63 W -1:000000000000
63 X 0:4e3505fd9583
64 X 0:4e3505fd9583
@@ -72,6 +73,7 b' delete a remote bookmark'
72 searching for changes
73 searching for changes
73 no changes found
74 no changes found
74 deleting remote bookmark W
75 deleting remote bookmark W
76 [1]
75
77
76 push/pull name that doesn't exist
78 push/pull name that doesn't exist
77
79
@@ -169,6 +171,7 b' hgweb'
169 searching for changes
171 searching for changes
170 no changes found
172 no changes found
171 exporting bookmark Z
173 exporting bookmark Z
174 [1]
172 $ hg book -d Z
175 $ hg book -d Z
173 $ hg in -B http://localhost:$HGPORT/
176 $ hg in -B http://localhost:$HGPORT/
174 comparing with http://localhost:$HGPORT/
177 comparing with http://localhost:$HGPORT/
@@ -181,6 +181,7 b' pushkey hook'
181 no changes found
181 no changes found
182 exporting bookmark foo
182 exporting bookmark foo
183 pushkey hook: HG_KEY=foo HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_RET=1
183 pushkey hook: HG_KEY=foo HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_RET=1
184 [1]
184 $ cd ../a
185 $ cd ../a
185
186
186 listkeys hook
187 listkeys hook
@@ -177,6 +177,7 b' test pushkeys and bookmarks'
177 searching for changes
177 searching for changes
178 no changes found
178 no changes found
179 exporting bookmark foo
179 exporting bookmark foo
180 [1]
180 $ hg debugpushkey --config ui.ssh="python $TESTDIR/dummyssh" ssh://user@dummy/remote bookmarks
181 $ hg debugpushkey --config ui.ssh="python $TESTDIR/dummyssh" ssh://user@dummy/remote bookmarks
181 foo 1160648e36cec0054048a7edc4110c6f84fde594
182 foo 1160648e36cec0054048a7edc4110c6f84fde594
182 $ hg book -f foo
183 $ hg book -f foo
@@ -203,6 +204,7 b' test pushkeys and bookmarks'
203 searching for changes
204 searching for changes
204 no changes found
205 no changes found
205 deleting remote bookmark foo
206 deleting remote bookmark foo
207 [1]
206
208
207 a bad, evil hook that prints to stdout
209 a bad, evil hook that prints to stdout
208
210
General Comments 0
You need to be logged in to leave comments. Login now