Mercurial > hg
annotate tests/test-mq-qpush-fail.t @ 23587:8063901e56cd
memctx: calculate exact status being committed from specified files
Before this patch, "memctx._status" is initialized by "(files, [], [],
[], [], [], [])" and this causes "memctx.modified" to include not
only modified files but also added and removed ones incorrectly.
This patch adds "_status" method to calculate exact status being
committed according to "files" specified at construction time.
Exact "_status" is useful to share/reuse logic of committablectx.
This patch is also preparation for issues fixed by subsequent patches.
Some details of changes for tests in this patch:
- some filename lines are omitted in "test-convert-svn-encoding.t",
because they are correctly listed up as "removed" files
those lines are written out in "localrepository.commitctx" for
"modified" and "added" files by "ui.note".
- "| fixbundle" filterring in "test-histedit-fold.t" is omitted to
check lines including "added" correctly
"fixbundle" discards all lines including "added".
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 17 Dec 2014 15:09:38 +0900 |
parents | c63a09b6b337 |
children | a387b0390082 |
rev | line source |
---|---|
12467
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
1 Test that qpush cleans things up if it doesn't complete |
4658
17f5d2069551
mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
12467
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
3 $ echo "[extensions]" >> $HGRCPATH |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
4 $ echo "mq=" >> $HGRCPATH |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
5 $ hg init repo |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
6 $ cd repo |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
7 $ echo foo > foo |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
8 $ hg ci -Am 'add foo' |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
9 adding foo |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
10 $ touch untracked-file |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
11 $ echo 'syntax: glob' > .hgignore |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
12 $ echo '.hgignore' >> .hgignore |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
13 $ hg qinit |
8795
51c29aec0b75
mq: eliminate warning on qpush with empty series
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
14 |
12467
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
15 test qpush on empty series |
4658
17f5d2069551
mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
16 |
12467
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
17 $ hg qpush |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
18 no patches in series |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
19 $ hg qnew patch1 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
20 $ echo >> foo |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
21 $ hg qrefresh -m 'patch 1' |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
22 $ hg qnew patch2 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
23 $ echo bar > bar |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
24 $ hg add bar |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
25 $ hg qrefresh -m 'patch 2' |
22545
6a2cfa61acb0
mq: upgrade non-plain patches to HG format when setting parent in patchheader
Mads Kiilerich <madski@unity3d.com>
parents:
22453
diff
changeset
|
26 $ hg qnew --config 'mq.plain=true' -U bad-patch |
12467
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
27 $ echo >> foo |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
28 $ hg qrefresh |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
29 $ hg qpop -a |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
30 popping bad-patch |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
31 popping patch2 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
32 popping patch1 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
33 patch queue now empty |
22947
c63a09b6b337
tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents:
22545
diff
changeset
|
34 $ $PYTHON -c 'print "\xe9"' > message |
12467
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
35 $ cat .hg/patches/bad-patch >> message |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
36 $ mv message .hg/patches/bad-patch |
17518 | 37 $ hg qpush -a && echo 'qpush succeeded?!' |
12467
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
38 applying patch1 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
39 applying patch2 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
40 applying bad-patch |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
41 transaction abort! |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
42 rollback completed |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
43 cleaning up working directory...done |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12467
diff
changeset
|
44 abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc) |
12467
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
45 [255] |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
46 $ hg parents |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
47 changeset: 0:bbd179dfa0a7 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
48 tag: tip |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
49 user: test |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
50 date: Thu Jan 01 00:00:00 1970 +0000 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
51 summary: add foo |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
52 |
4658
17f5d2069551
mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
53 |
13508
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
54 test corrupt status file |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
55 $ hg qpush |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
56 applying patch1 |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
57 now at: patch1 |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
58 $ cp .hg/patches/status .hg/patches/status.orig |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
59 $ hg qpop |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
60 popping patch1 |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
61 patch queue now empty |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
62 $ cp .hg/patches/status.orig .hg/patches/status |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
63 $ hg qpush |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
64 abort: working directory revision is not qtip |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
65 [255] |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
66 $ rm .hg/patches/status .hg/patches/status.orig |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
67 |
0396ca8015be
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents:
13369
diff
changeset
|
68 |
12467
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
69 bar should be gone; other unknown/ignored files should still be around |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
70 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
71 $ hg status -A |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
72 ? untracked-file |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
73 I .hgignore |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
74 C foo |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
75 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
76 preparing qpush of a missing patch |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
77 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
78 $ hg qpop -a |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
79 no patches applied |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
80 $ hg qpush |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
81 applying patch1 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
82 now at: patch1 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
83 $ rm .hg/patches/patch2 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
84 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
85 now we expect the push to fail, but it should NOT complain about patch1 |
8875
801cacf46e62
mq: fix error message for qpush inexistent-patch (issue1702)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8795
diff
changeset
|
86 |
12467
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
87 $ hg qpush |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
88 applying patch2 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
89 unable to read patch2 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
90 now at: patch1 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
91 [1] |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
92 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
93 preparing qpush of missing patch with no patch applied |
8875
801cacf46e62
mq: fix error message for qpush inexistent-patch (issue1702)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8795
diff
changeset
|
94 |
12467
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
95 $ hg qpop -a |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
96 popping patch1 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
97 patch queue now empty |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
98 $ rm .hg/patches/patch1 |
9590
07a62819b309
mq: fix traceback for qpush inexistant-patch with no patch applied
Benoit Allard <benoit@aeteurope.nl>
parents:
8875
diff
changeset
|
99 |
12467
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
100 qpush should fail the same way as below |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
101 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
102 $ hg qpush |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
103 applying patch1 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
104 unable to read patch1 |
05e1171cf4ca
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents:
10397
diff
changeset
|
105 [1] |
13369
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
106 |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
107 Test qpush to a patch below the currently applied patch. |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
108 |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
109 $ hg qq -c guardedseriesorder |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
110 $ hg qnew a |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
111 $ hg qguard +block |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
112 $ hg qnew b |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
113 $ hg qnew c |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
114 |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
115 $ hg qpop -a |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
116 popping c |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
117 popping b |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
118 popping a |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
119 patch queue now empty |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
120 |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
121 try to push and pop while a is guarded |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
122 |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
123 $ hg qpush a |
14464
00256f689f9c
mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards
Martin Geisler <mg@aragost.com>
parents:
13508
diff
changeset
|
124 cannot push 'a' - guarded by '+block' |
13369
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
125 [1] |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
126 $ hg qpush -a |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
127 applying b |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
128 patch b is empty |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
129 applying c |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
130 patch c is empty |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
131 now at: c |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
132 |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
133 now try it when a is unguarded, and we're at the top of the queue |
22453
fd0f0b0d316d
mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18217
diff
changeset
|
134 |
fd0f0b0d316d
mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18217
diff
changeset
|
135 $ hg qapplied -v |
fd0f0b0d316d
mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18217
diff
changeset
|
136 0 G a |
fd0f0b0d316d
mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18217
diff
changeset
|
137 1 A b |
fd0f0b0d316d
mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18217
diff
changeset
|
138 2 A c |
13369
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
139 $ hg qsel block |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
140 $ hg qpush b |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
141 abort: cannot push to a previous patch: b |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
142 [255] |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
143 $ hg qpush a |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
144 abort: cannot push to a previous patch: a |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
145 [255] |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
146 |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
147 and now we try it one more time with a unguarded, while we're not at the top of the queue |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
148 |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
149 $ hg qpop b |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
150 popping c |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
151 now at: b |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
152 $ hg qpush a |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
153 abort: cannot push to a previous patch: a |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
154 [255] |
69238d0ca60f
mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents:
12942
diff
changeset
|
155 |
16633
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
156 test qpop --force and backup files |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
157 |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
158 $ hg qpop -a |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
159 popping b |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
160 patch queue now empty |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
161 $ hg qq --create force |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
162 $ echo a > a |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
163 $ echo b > b |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
164 $ echo c > c |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
165 $ hg ci -Am add a b c |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
166 $ echo a >> a |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
167 $ hg rm b |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
168 $ hg rm c |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
169 $ hg qnew p1 |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
170 $ echo a >> a |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
171 $ echo bb > b |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
172 $ hg add b |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
173 $ echo cc > c |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
174 $ hg add c |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
175 $ hg qpop --force --verbose |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
176 saving current version of a as a.orig |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
177 saving current version of b as b.orig |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
178 saving current version of c as c.orig |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
179 popping p1 |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
180 patch queue now empty |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
181 $ hg st |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
182 ? a.orig |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
183 ? b.orig |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
184 ? c.orig |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
185 ? untracked-file |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
186 $ cat a.orig |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
187 a |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
188 a |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
189 a |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
190 $ cat b.orig |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
191 bb |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
192 $ cat c.orig |
b2ca2f40c9c1
mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents:
14464
diff
changeset
|
193 cc |
16634
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
194 |
16635
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
195 test qpop --force --no-backup |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
196 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
197 $ hg qpush |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
198 applying p1 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
199 now at: p1 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
200 $ rm a.orig |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
201 $ echo a >> a |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
202 $ hg qpop --force --no-backup --verbose |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
203 popping p1 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
204 patch queue now empty |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
205 $ test -f a.orig && echo 'error: backup with --no-backup' |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
206 [1] |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
207 |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
208 test qpop --keep-changes |
16653
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
209 |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
210 $ hg qpush |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
211 applying p1 |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
212 now at: p1 |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
213 $ hg qpop --keep-changes --force |
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
214 abort: cannot use both --force and --keep-changes |
16653
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
215 [255] |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
216 $ echo a >> a |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
217 $ hg qpop --keep-changes |
16653
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
218 abort: local changes found, refresh first |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
219 [255] |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
220 $ hg revert -qa a |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
221 $ rm a |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
222 $ hg qpop --keep-changes |
16653
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
223 abort: local changes found, refresh first |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
224 [255] |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
225 $ hg rm -A a |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
226 $ hg qpop --keep-changes |
16653
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
227 abort: local changes found, refresh first |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
228 [255] |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
229 $ hg revert -qa a |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
230 $ echo b > b |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
231 $ hg add b |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
232 $ hg qpop --keep-changes |
16653
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
233 abort: local changes found, refresh first |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
234 [255] |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
235 $ hg forget b |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
236 $ echo d > d |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
237 $ hg add d |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
238 $ hg qpop --keep-changes |
16653
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
239 popping p1 |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
240 patch queue now empty |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
241 $ hg forget d |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
242 $ rm d |
73b8c2554be8
mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents:
16635
diff
changeset
|
243 |
16634
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
244 test qpush --force and backup files |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
245 |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
246 $ echo a >> a |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
247 $ hg qnew p2 |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
248 $ echo b >> b |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
249 $ echo d > d |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
250 $ echo e > e |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
251 $ hg add d e |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
252 $ hg rm c |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
253 $ hg qnew p3 |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
254 $ hg qpop -a |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
255 popping p3 |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
256 popping p2 |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
257 patch queue now empty |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
258 $ echo a >> a |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
259 $ echo b1 >> b |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
260 $ echo d1 > d |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
261 $ hg add d |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
262 $ echo e1 > e |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
263 $ hg qpush -a --force --verbose |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
264 applying p2 |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
265 saving current version of a as a.orig |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
266 patching file a |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
267 a |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
268 applying p3 |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
269 saving current version of b as b.orig |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
270 saving current version of d as d.orig |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
271 patching file b |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
272 patching file c |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
273 patching file d |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
274 file d already exists |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
275 1 out of 1 hunks FAILED -- saving rejects to file d.rej |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
276 patching file e |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
277 file e already exists |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
278 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
279 patch failed to apply |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
280 b |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
281 patch failed, rejects left in working dir |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
282 errors during apply, please fix and refresh p3 |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
283 [2] |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
284 $ cat a.orig |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
285 a |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
286 a |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
287 $ cat b.orig |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
288 b |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
289 b1 |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
290 $ cat d.orig |
435375cc0ca0
mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents:
16633
diff
changeset
|
291 d1 |
16635
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
292 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
293 test qpush --force --no-backup |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
294 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
295 $ hg revert -qa |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
296 $ hg qpop -a |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
297 popping p3 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
298 popping p2 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
299 patch queue now empty |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
300 $ echo a >> a |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
301 $ rm a.orig |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
302 $ hg qpush --force --no-backup --verbose |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
303 applying p2 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
304 patching file a |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
305 a |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
306 now at: p2 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
307 $ test -f a.orig && echo 'error: backup with --no-backup' |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
308 [1] |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
309 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
310 test qgoto --force --no-backup |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
311 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
312 $ hg qpop |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
313 popping p2 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
314 patch queue now empty |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
315 $ echo a >> a |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
316 $ hg qgoto --force --no-backup p2 --verbose |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
317 applying p2 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
318 patching file a |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
319 a |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
320 now at: p2 |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
321 $ test -f a.orig && echo 'error: backup with --no-backup' |
9d76320d8b99
mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents:
16634
diff
changeset
|
322 [1] |
16654
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
323 |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
324 test qpush --keep-changes |
16654
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
325 |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
326 $ hg qpush --keep-changes --force |
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
327 abort: cannot use both --force and --keep-changes |
16654
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
328 [255] |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
329 $ hg qpush --keep-changes --exact |
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
330 abort: cannot use --exact and --keep-changes together |
16654
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
331 [255] |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
332 $ echo b >> b |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
333 $ hg qpush --keep-changes |
16654
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
334 applying p3 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
335 errors during apply, please fix and refresh p2 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
336 [2] |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
337 $ rm b |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
338 $ hg qpush --keep-changes |
16654
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
339 applying p3 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
340 errors during apply, please fix and refresh p2 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
341 [2] |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
342 $ hg rm -A b |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
343 $ hg qpush --keep-changes |
16654
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
344 applying p3 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
345 errors during apply, please fix and refresh p2 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
346 [2] |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
347 $ hg revert -aq b |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
348 $ echo d > d |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
349 $ hg add d |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
350 $ hg qpush --keep-changes |
16654
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
351 applying p3 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
352 errors during apply, please fix and refresh p2 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
353 [2] |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
354 $ hg forget d |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
355 $ rm d |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
356 $ hg qpop |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
357 popping p2 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
358 patch queue now empty |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
359 $ echo b >> b |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
360 $ hg qpush -a --keep-changes |
16654
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
361 applying p2 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
362 applying p3 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
363 errors during apply, please fix and refresh p2 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
364 [2] |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
365 $ hg qtop |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
366 p2 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
367 $ hg parents --template "{rev} {desc}\n" |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
368 2 imported patch p2 |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
369 $ hg st b |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
370 M b |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
371 $ cat b |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
372 b |
490ed8972f1b
mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents:
16653
diff
changeset
|
373 b |
16655
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
374 |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
375 test qgoto --keep-changes |
16655
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
376 |
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
377 $ hg revert -aq b |
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
378 $ rm e |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
379 $ hg qgoto --keep-changes --force p3 |
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
380 abort: cannot use both --force and --keep-changes |
16655
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
381 [255] |
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
382 $ echo a >> a |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
383 $ hg qgoto --keep-changes p3 |
16655
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
384 applying p3 |
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
385 now at: p3 |
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
386 $ hg st a |
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
387 M a |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
388 $ hg qgoto --keep-changes p2 |
16655
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
389 popping p3 |
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
390 now at: p2 |
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
391 $ hg st a |
6ca125af882f
mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents:
16654
diff
changeset
|
392 M a |
16656
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
393 |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
394 test mq.keepchanges setting |
16656
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
395 |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
396 $ hg --config mq.keepchanges=1 qpush |
16656
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
397 applying p3 |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
398 now at: p3 |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
399 $ hg st a |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
400 M a |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
401 $ hg --config mq.keepchanges=1 qpop |
16656
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
402 popping p3 |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
403 now at: p2 |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
404 $ hg st a |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
405 M a |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
406 $ hg --config mq.keepchanges=1 qgoto p3 |
16656
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
407 applying p3 |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
408 now at: p3 |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
409 $ hg st a |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
410 M a |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
411 $ echo b >> b |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
412 $ hg --config mq.keepchanges=1 qpop --force |
16656
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
413 popping p3 |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
414 now at: p2 |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
415 $ hg st b |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
416 $ hg --config mq.keepchanges=1 qpush --exact |
16656
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
417 abort: local changes found, refresh first |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
418 [255] |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
419 $ hg revert -qa a |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
420 $ hg qpop |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
421 popping p2 |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
422 patch queue now empty |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
423 $ echo a >> a |
16733
4da10c00a20c
mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents:
16656
diff
changeset
|
424 $ hg --config mq.keepchanges=1 qpush --force |
16656
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
425 applying p2 |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
426 now at: p2 |
4ae3ba9e4d7a
mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents:
16655
diff
changeset
|
427 $ hg st a |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16733
diff
changeset
|
428 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16733
diff
changeset
|
429 $ cd .. |