##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-obsolete-checkheads: fix on windows
Patrick Mezard -
r17564:6d0efc80 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -41,7 +41,7 b' setup'
41 41
42 42 $ mkcommit old
43 43 $ hg push
44 pushing to $TESTTMP/remote
44 pushing to $TESTTMP/remote (glob)
45 45 searching for changes
46 46 adding changesets
47 47 adding manifests
@@ -64,7 +64,7 b' old exists remotely as draft. It is obso'
64 64 Push should not warn about creating new head
65 65
66 66 $ hg push
67 pushing to $TESTTMP/remote
67 pushing to $TESTTMP/remote (glob)
68 68 searching for changes
69 69 adding changesets
70 70 adding manifests
@@ -80,7 +80,7 b' setup'
80 80 $ cp -r ../backup1 ../remote
81 81 $ hg -R ../remote phase --public c70b08862e08
82 82 $ hg pull -v
83 pulling from $TESTTMP/remote
83 pulling from $TESTTMP/remote (glob)
84 84 searching for changes
85 85 no changes found
86 86 $ hg glog --hidden
@@ -94,7 +94,7 b' setup'
94 94 Abort: old will still be an head because it's public.
95 95
96 96 $ hg push
97 pushing to $TESTTMP/remote
97 pushing to $TESTTMP/remote (glob)
98 98 searching for changes
99 99 abort: push creates new remote head 71e3228bffe1!
100 100 (did you forget to merge? use push -f to force)
@@ -154,7 +154,7 b' old exists remotely as draft. It is obso'
154 154 Push should abort on new head
155 155
156 156 $ hg push -r 'desc("other")'
157 pushing to $TESTTMP/remote
157 pushing to $TESTTMP/remote (glob)
158 158 searching for changes
159 159 abort: push creates new remote head d7d41ccbd4de!
160 160 (did you forget to merge? use push -f to force)
@@ -181,7 +181,7 b' setup. (The obsolete marker is known loc'
181 181 $ mkcommit new
182 182 created new head
183 183 $ hg push -f
184 pushing to $TESTTMP/remote
184 pushing to $TESTTMP/remote (glob)
185 185 searching for changes
186 186 adding changesets
187 187 adding manifests
@@ -216,7 +216,7 b' Push should not warn about adding new he'
216 216 one anyway.
217 217
218 218 $ hg push
219 pushing to $TESTTMP/remote
219 pushing to $TESTTMP/remote (glob)
220 220 searching for changes
221 221 adding changesets
222 222 adding manifests
@@ -264,7 +264,7 b' It should not complain about "unsynced r'
264 264 handled yet.
265 265
266 266 $ hg push --traceback
267 pushing to $TESTTMP/remote
267 pushing to $TESTTMP/remote (glob)
268 268 searching for changes
269 269 adding changesets
270 270 adding manifests
General Comments 0
You need to be logged in to leave comments. Login now