Show More
@@ -111,7 +111,7 b' plain headers' | |||||
111 | abort: "#" cannot be used in the name of a patch |
|
111 | abort: "#" cannot be used in the name of a patch | |
112 | abort: ":" cannot be used in the name of a patch |
|
112 | abort: ":" cannot be used in the name of a patch | |
113 | % qnew with name containing slash |
|
113 | % qnew with name containing slash | |
114 | abort: path ends in directory separator: foo/ |
|
114 | abort: path ends in directory separator: foo/ (glob) | |
115 | abort: "foo" already exists as a directory |
|
115 | abort: "foo" already exists as a directory | |
116 | foo/bar.patch |
|
116 | foo/bar.patch | |
117 | popping foo/bar.patch |
|
117 | popping foo/bar.patch | |
@@ -178,7 +178,7 b' hg headers' | |||||
178 | abort: "#" cannot be used in the name of a patch |
|
178 | abort: "#" cannot be used in the name of a patch | |
179 | abort: ":" cannot be used in the name of a patch |
|
179 | abort: ":" cannot be used in the name of a patch | |
180 | % qnew with name containing slash |
|
180 | % qnew with name containing slash | |
181 | abort: path ends in directory separator: foo/ |
|
181 | abort: path ends in directory separator: foo/ (glob) | |
182 | abort: "foo" already exists as a directory |
|
182 | abort: "foo" already exists as a directory | |
183 | foo/bar.patch |
|
183 | foo/bar.patch | |
184 | popping foo/bar.patch |
|
184 | popping foo/bar.patch |
@@ -286,25 +286,25 b' Check rebasing public changeset' | |||||
286 | Check rebasing mutable changeset |
|
286 | Check rebasing mutable changeset | |
287 | Source phase greater or equal to destination phase: new changeset get the phase of source: |
|
287 | Source phase greater or equal to destination phase: new changeset get the phase of source: | |
288 | $ hg rebase -s9 -d0 |
|
288 | $ hg rebase -s9 -d0 | |
289 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg |
|
289 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg (glob) | |
290 | $ hg log --template "{phase}\n" -r 9 |
|
290 | $ hg log --template "{phase}\n" -r 9 | |
291 | draft |
|
291 | draft | |
292 | $ hg rebase -s9 -d1 |
|
292 | $ hg rebase -s9 -d1 | |
293 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg |
|
293 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg (glob) | |
294 | $ hg log --template "{phase}\n" -r 9 |
|
294 | $ hg log --template "{phase}\n" -r 9 | |
295 | draft |
|
295 | draft | |
296 | $ hg phase --force --secret 9 |
|
296 | $ hg phase --force --secret 9 | |
297 | $ hg rebase -s9 -d0 |
|
297 | $ hg rebase -s9 -d0 | |
298 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg |
|
298 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg (glob) | |
299 | $ hg log --template "{phase}\n" -r 9 |
|
299 | $ hg log --template "{phase}\n" -r 9 | |
300 | secret |
|
300 | secret | |
301 | $ hg rebase -s9 -d1 |
|
301 | $ hg rebase -s9 -d1 | |
302 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg |
|
302 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob) | |
303 | $ hg log --template "{phase}\n" -r 9 |
|
303 | $ hg log --template "{phase}\n" -r 9 | |
304 | secret |
|
304 | secret | |
305 | Source phase lower than destination phase: new changeset get the phase of destination: |
|
305 | Source phase lower than destination phase: new changeset get the phase of destination: | |
306 | $ hg rebase -s7 -d9 |
|
306 | $ hg rebase -s7 -d9 | |
307 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c9659aac0000-backup.hg |
|
307 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c9659aac0000-backup.hg (glob) | |
308 | $ hg log --template "{phase}\n" -r 9 |
|
308 | $ hg log --template "{phase}\n" -r 9 | |
309 | secret |
|
309 | secret | |
310 |
|
310 |
@@ -283,7 +283,7 b' Test hg-ssh:' | |||||
283 | $ SSH_ORIGINAL_COMMAND="'hg' -R 'a repo' serve --stdio" hg id --ssh "python \"$TESTDIR\"/../contrib/hg-ssh \"$TESTTMP/a repo\"" "ssh://user@dummy/a repo" |
|
283 | $ SSH_ORIGINAL_COMMAND="'hg' -R 'a repo' serve --stdio" hg id --ssh "python \"$TESTDIR\"/../contrib/hg-ssh \"$TESTTMP/a repo\"" "ssh://user@dummy/a repo" | |
284 | 3fb238f49e8c |
|
284 | 3fb238f49e8c | |
285 | $ SSH_ORIGINAL_COMMAND="'hg' -R 'a repo' serve --stdio" hg id --ssh "python \"$TESTDIR\"/../contrib/hg-ssh \"$TESTTMP\"" "ssh://user@dummy/a repo" |
|
285 | $ SSH_ORIGINAL_COMMAND="'hg' -R 'a repo' serve --stdio" hg id --ssh "python \"$TESTDIR\"/../contrib/hg-ssh \"$TESTTMP\"" "ssh://user@dummy/a repo" | |
286 | remote: Illegal repository '$TESTTMP/a repo' |
|
286 | remote: Illegal repository '$TESTTMP/a repo' (glob) | |
287 | abort: no suitable response from remote hg! |
|
287 | abort: no suitable response from remote hg! | |
288 | [255] |
|
288 | [255] | |
289 | $ SSH_ORIGINAL_COMMAND="'hg' -R 'a'repo' serve --stdio" hg id --ssh "python \"$TESTDIR\"/../contrib/hg-ssh \"$TESTTMP\"" "ssh://user@dummy/a repo" |
|
289 | $ SSH_ORIGINAL_COMMAND="'hg' -R 'a'repo' serve --stdio" hg id --ssh "python \"$TESTDIR\"/../contrib/hg-ssh \"$TESTTMP\"" "ssh://user@dummy/a repo" |
@@ -197,7 +197,7 b' Test explicit path commands within subre' | |||||
197 | $ hg status -S |
|
197 | $ hg status -S | |
198 | ? foo/bar/z2.txt |
|
198 | ? foo/bar/z2.txt | |
199 | $ hg forget foo/bar/z2.txt |
|
199 | $ hg forget foo/bar/z2.txt | |
200 | not removing foo/bar/z2.txt: file is already untracked |
|
200 | not removing foo/bar/z2.txt: file is already untracked (glob) | |
201 | [1] |
|
201 | [1] | |
202 | $ hg status -S |
|
202 | $ hg status -S | |
203 | ? foo/bar/z2.txt |
|
203 | ? foo/bar/z2.txt |
@@ -43,7 +43,7 b' Revert subrepo and test subrepo fileset ' | |||||
43 | $ echo b > s/a |
|
43 | $ echo b > s/a | |
44 | $ hg revert "set:subrepo('glob:s*')" |
|
44 | $ hg revert "set:subrepo('glob:s*')" | |
45 | reverting subrepo s |
|
45 | reverting subrepo s | |
46 | reverting s/a |
|
46 | reverting s/a (glob) | |
47 | $ rm s/a.orig |
|
47 | $ rm s/a.orig | |
48 |
|
48 | |||
49 | Revert subrepo with no backup. The "reverting s/a" line is gone since |
|
49 | Revert subrepo with no backup. The "reverting s/a" line is gone since |
General Comments 0
You need to be logged in to leave comments.
Login now