Mercurial > hg
annotate tests/test-mq-safety.out @ 11512:488a80c840ac stable
mercurial.spec: rename docutils to python-docutils in BuildRequires
Even though the name of the project is Docutils, most packagers use
the package name python-docutils to fit into the naming scheme of
other packages written in Python. The name is used by Fedora, EPEL,
DAG, Mandriva, and a few other distributions.
author | Julian Cowley <julian@lava.net> |
---|---|
date | Fri, 02 Jul 2010 14:14:30 -1000 |
parents | 6e65b451b62e |
children | ab237534d800 |
rev | line source |
---|---|
5980
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 % try to commit on top of a patch |
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 abort: cannot commit over an applied mq patch |
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
3 % qpop/qrefresh on the wrong revision |
7621
6d891df43a5f
mq: allow qpop if popped revisions are not working dir parents
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5980
diff
changeset
|
4 abort: popping would remove a revision not managed by this patch queue |
5980
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 using patch queue: |
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
6 abort: popping would remove a revision not managed by this patch queue |
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
7 abort: working directory revision is not qtip |
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
9 % qpop |
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 abort: popping would remove a revision not managed by this patch queue |
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 % qrefresh |
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 abort: cannot refresh a revision with children |
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
13 % tip: |
dcda0c90125c
mq: pop/refresh: avoid losing revisions not managed by mq
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
14 3 append quux |
10362
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
15 % qpush warning branchheads |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
16 popping qp |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
17 patch queue now empty |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
18 adding a |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
19 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
20 marked working directory as branch b |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
21 adding c |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
23 (branch merge, don't forget to commit) |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
24 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
25 changeset: 2:65309210bf4e |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
26 branch: b |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
27 tag: tip |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
28 parent: 1:707adb4c8ae1 |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
29 parent: 0:cb9a9f314b8b |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
30 user: test |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
31 date: Thu Jan 01 00:00:00 1970 +0000 |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
32 summary: merge |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
33 |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
34 changeset: 1:707adb4c8ae1 |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
35 branch: b |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
36 parent: -1:000000000000 |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
37 user: test |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
38 date: Thu Jan 01 00:00:00 1970 +0000 |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
39 summary: c |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
40 |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
41 changeset: 0:cb9a9f314b8b |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
42 user: test |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
43 date: Thu Jan 01 00:00:00 1970 +0000 |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
44 summary: a |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
45 |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
46 applying qp |
2e3ec7ef5349
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
7621
diff
changeset
|
47 now at: qp |