Mercurial > evolve
annotate tests/test-evolve.t @ 3764:f0f9139016d8 stable
topic: use preformatted block for config snippets documentation
We add :: markers, empty line and properly indent blocks where needed.
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Wed, 23 May 2018 11:00:11 +0200 |
parents | f6979d64b9fb |
children | 19ec729f3ca2 1e103c7f7663 |
rev | line source |
---|---|
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
2 > [defaults] |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
3 > amend=-d "0 0" |
915
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
4 > fold=-d "0 0" |
1685
4fd0db2f6d84
commands: introduce a new command to edit commit metadata
Siddharth Agarwal <sid0@fb.com>
parents:
1673
diff
changeset
|
5 > metaedit=-d "0 0" |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
6 > [web] |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
7 > push_ssl = false |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
8 > allow_push = * |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
9 > [phases] |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
10 > publish = False |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
11 > [alias] |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
12 > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n' |
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
13 > [diff] |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
14 > git = 1 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
15 > unified = 0 |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
16 > [extensions] |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
17 > EOF |
1806
9f42f819267b
evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1785
diff
changeset
|
18 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 $ mkcommit() { |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
20 > echo "$1" > "$1" |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 > hg add "$1" |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 > hg ci -m "add $1" |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 > } |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
24 |
1358
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
25 $ mkstack() { |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
26 > # Creates a stack of commit based on $1 with messages from $2, $3 .. |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
27 > hg update $1 -C |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
28 > shift |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
29 > mkcommits $* |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
30 > } |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
31 |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
32 $ glog() { |
2776
4dd84054ebbb
test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2767
diff
changeset
|
33 > hg log -G --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
34 > } |
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
35 |
1358
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
36 $ shaof() { |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
37 > hg log -T {node} -r "first(desc($1))" |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
38 > } |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
39 |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
40 $ mkcommits() { |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
41 > for i in $@; do mkcommit $i ; done |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
42 > } |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
43 |
1414
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
44 Test the evolution test topic is installed |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
45 |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
46 $ hg help evolution |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
47 Safely Rewriting History |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
48 """""""""""""""""""""""" |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
49 |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
50 Obsolescence markers make it possible to mark changesets that have been |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
51 deleted or superset in a new version of the changeset. |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
52 |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
53 Unlike the previous way of handling such changes, by stripping the old |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
54 changesets from the repository, obsolescence markers can be propagated |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
55 between repositories. This allows for a safe and simple way of exchanging |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
56 mutable history and altering it after the fact. Changeset phases are |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
57 respected, such that only draft and secret changesets can be altered (see |
1709
989ed2f30d41
help: fix evolution hg phases reference
timeless@gmail.com
parents:
1686
diff
changeset
|
58 'hg help phases' for details). |
1414
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
59 |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
60 Obsolescence is tracked using "obsolete markers", a piece of metadata |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
61 tracking which changesets have been made obsolete, potential successors |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
62 for a given changeset, the moment the changeset was marked as obsolete, |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
63 and the user who performed the rewriting operation. The markers are stored |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
64 separately from standard changeset data can be exchanged without any of |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
65 the precursor changesets, preventing unnecessary exchange of obsolescence |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
66 data. |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
67 |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
68 The complete set of obsolescence markers describes a history of changeset |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
69 modifications that is orthogonal to the repository history of file |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
70 modifications. This changeset history allows for detection and automatic |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
71 resolution of edge cases arising from multiple users rewriting the same |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
72 part of history concurrently. |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
73 |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
74 Current feature status |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
75 ====================== |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
76 |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
77 This feature is still in development. If you see this help, you have |
1710 | 78 enabled an extension that turned this feature on. |
1414
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
79 |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
80 Obsolescence markers will be exchanged between repositories that |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
81 explicitly assert support for the obsolescence feature (this can currently |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
82 only be done via an extension). |
2782
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
83 |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
84 Instability ========== |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
85 |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
86 (note: the vocabulary is in the process of being updated) |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
87 |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
88 Rewriting changesets might introduce instability (currently 'trouble'). |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
89 |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
90 There are two main kinds of instability: orphaning and diverging. |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
91 |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
92 Orphans are changesets left behind when their ancestors are rewritten, |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
93 (currently: 'unstable'). Divergence has two variants: |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
94 |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
95 * Content-divergence occurs when independent rewrites of the same |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
96 changesets lead to different results. (currently: 'divergent') |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
97 * Phase-divergence occurs when the old (obsolete) version of a changeset |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
98 becomes public. (currently: 'bumped') |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
99 |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
100 If it possible to prevent local creation of orphans by using the following |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
101 config: |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
102 |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
103 [experimental] |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
104 evolution=createmarkers,allnewcommands,exchange |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
105 |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
106 You can also enable that option explicitly: |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
107 |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
108 [experimental] |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
109 evolution=createmarkers,allnewcommands,allowunstable,exchange |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
110 |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
111 or simply: |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
112 |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
113 [experimental] |
2bd0b0996cfb
evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2776
diff
changeset
|
114 evolution=all |
1414
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
115 |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
116 various init |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
117 |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
118 $ hg init local |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
119 $ cd local |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
120 $ mkcommit a |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
121 $ mkcommit b |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
122 $ cat >> .hg/hgrc << EOF |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
123 > [phases] |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
124 > publish = True |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
125 > EOF |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
126 $ hg pull -q . # make 1 public |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
127 $ rm .hg/hgrc |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
128 $ mkcommit c |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
129 $ mkcommit d |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
130 $ hg up 1 |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
131 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
132 $ mkcommit e -q |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
133 created new head |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
134 $ mkcommit f |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
135 $ hg qlog |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
136 5 - e44648563c73 add f (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
137 4 - fbb94e3a0ecf add e (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
138 3 - 47d2a3944de8 add d (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
139 2 - 4538525df7e2 add c (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
140 1 - 7c3bad9141dc add b (public) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
141 0 - 1f0dee641bb7 add a (public) |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
142 |
414
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
143 test kill and immutable changeset |
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
144 |
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
145 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1731
diff
changeset
|
146 1 public |
1631
7463f5880ce9
prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1594
diff
changeset
|
147 $ hg prune 1 |
2789
06ee4ec88190
prune: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2788
diff
changeset
|
148 abort: cannot touch public changesets: 7c3bad9141dc |
1756
a7dcfff8c4a9
evolve: use single quotes in usage messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
1753
diff
changeset
|
149 (see 'hg help phases' for details) |
444
aedb6b8ace86
drop repo.addobsolete
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
443
diff
changeset
|
150 [255] |
414
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
151 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1731
diff
changeset
|
152 1 public |
414
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
153 |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
154 test simple kill |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
155 |
317
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
156 $ hg id -n |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
157 5 |
1631
7463f5880ce9
prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1594
diff
changeset
|
158 $ hg prune . |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
159 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
160 working directory now at fbb94e3a0ecf |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1197
diff
changeset
|
161 1 changesets pruned |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
162 $ hg qlog |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
163 4 - fbb94e3a0ecf add e (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
164 3 - 47d2a3944de8 add d (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
165 2 - 4538525df7e2 add c (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
166 1 - 7c3bad9141dc add b (public) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
167 0 - 1f0dee641bb7 add a (public) |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
168 |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
169 test multiple kill |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
170 |
1631
7463f5880ce9
prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1594
diff
changeset
|
171 $ hg prune 4 -r 3 |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
172 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
173 working directory now at 7c3bad9141dc |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1197
diff
changeset
|
174 2 changesets pruned |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
175 $ hg qlog |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
176 2 - 4538525df7e2 add c (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
177 1 - 7c3bad9141dc add b (public) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
178 0 - 1f0dee641bb7 add a (public) |
317
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
179 |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
180 test kill with dirty changes |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
181 |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
182 $ hg up 2 |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
183 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
184 $ echo 4 > g |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
185 $ hg add g |
1631
7463f5880ce9
prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1594
diff
changeset
|
186 $ hg prune . |
317
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
187 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
188 working directory now at 7c3bad9141dc |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1197
diff
changeset
|
189 1 changesets pruned |
317
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
190 $ hg st |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
191 A g |
1279
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
192 |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
193 Smoketest debugobsrelsethashtree: |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
194 |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
195 $ hg debugobsrelsethashtree |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
196 1f0dee641bb7258c56bd60e93edfa2405381c41e 0000000000000000000000000000000000000000 |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
197 7c3bad9141dcb46ff89abf5f61856facd56e476c * (glob) |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
198 4538525df7e2b9f09423636c61ef63a4cb872a2d * (glob) |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
199 47d2a3944de8b013de3be9578e8e344ea2e6c097 * (glob) |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
200 fbb94e3a0ecf6d20c2cc31152ef162ce45af982f * (glob) |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
201 e44648563c73f75950076031c6fdf06629de95f1 * (glob) |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
202 |
2083
778afb036245
discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1806
diff
changeset
|
203 Smoketest stablerange.obshash: |
778afb036245
discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1806
diff
changeset
|
204 |
2230
a202f3af890c
debugobshashrange: add a --subranges option
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2229
diff
changeset
|
205 $ hg debugobshashrange --subranges --rev 'head()' |
2228
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
206 rev node index size depth obshash |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
207 1 7c3bad9141dc 0 2 2 * (glob) |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
208 0 1f0dee641bb7 0 1 1 000000000000 |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
209 1 7c3bad9141dc 1 1 2 * (glob) |
2083
778afb036245
discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1806
diff
changeset
|
210 |
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
211 $ cd .. |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
212 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
213 ########################## |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
214 importing Parren test |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
215 ########################## |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
216 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
217 $ cat << EOF >> $HGRCPATH |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
218 > [ui] |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
219 > logtemplate = "{rev}\t{bookmarks}: {desc|firstline} - {author|user}\n" |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
220 > EOF |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
221 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
222 Creating And Updating Changeset |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
223 =============================== |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
224 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
225 Setup the Base Repo |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
226 ------------------- |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
227 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
228 We start with a plain base repo:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
229 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
230 $ hg init main; cd main |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
231 $ cat >main-file-1 <<-EOF |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
232 > One |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
233 > |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
234 > Two |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
235 > |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
236 > Three |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
237 > EOF |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
238 $ echo Two >main-file-2 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
239 $ hg add |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
240 adding main-file-1 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
241 adding main-file-2 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
242 $ hg commit --message base |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
243 $ cd .. |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
244 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
245 and clone this into a new repo where we do our work:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
246 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
247 $ hg clone main work |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
248 updating to branch default |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
249 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
250 $ cd work |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
251 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
252 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
253 Create First Patch |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
254 ------------------ |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
255 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
256 To begin with, we just do the changes that will be the initial version of the changeset:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
257 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
258 $ echo One >file-from-A |
88
64fe5a4f877e
[evolution] first workign draft of a relocate function
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
87
diff
changeset
|
259 $ sed -i'' -e s/One/Eins/ main-file-1 |
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
260 $ hg add file-from-A |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
261 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
262 So this is what we would like our changeset to be:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
263 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
264 $ hg diff |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
265 diff --git a/file-from-A b/file-from-A |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
266 new file mode 100644 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
267 --- /dev/null |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
268 +++ b/file-from-A |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
269 @@ -0,0 +1,1 @@ |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
270 +One |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
271 diff --git a/main-file-1 b/main-file-1 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
272 --- a/main-file-1 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
273 +++ b/main-file-1 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
274 @@ -1,1 +1,1 @@ |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
275 -One |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
276 +Eins |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
277 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
278 To commit it we just - commit it:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
279 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
280 $ hg commit --message "a nifty feature" |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
281 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
282 and place a bookmark so we can easily refer to it again (which we could have done before the commit):: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
283 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
284 $ hg book feature-A |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
285 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
286 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
287 Create Second Patch |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
288 ------------------- |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
289 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
290 Let's do this again for the second changeset:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
291 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
292 $ echo Two >file-from-B |
88
64fe5a4f877e
[evolution] first workign draft of a relocate function
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
87
diff
changeset
|
293 $ sed -i'' -e s/Two/Zwie/ main-file-1 |
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
294 $ hg add file-from-B |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
295 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
296 Before committing, however, we need to switch to a new bookmark for the second |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
297 changeset. Otherwise we would inadvertently move the bookmark for our first changeset. |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
298 It is therefore advisable to always set the bookmark before committing:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
299 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
300 $ hg book feature-B |
1105
836c4128c027
test: add parent hash to commit message in test-evolve.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
1104
diff
changeset
|
301 $ hg commit --message "another feature (child of $(hg log -r . -T '{node|short}'))" |
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
302 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
303 So here we are:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
304 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
305 $ hg book |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
306 feature-A 1:568a468b60fc |
1105
836c4128c027
test: add parent hash to commit message in test-evolve.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
1104
diff
changeset
|
307 * feature-B 2:73296a82292a |
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
308 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
309 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
310 Fix The Second Patch |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
311 -------------------- |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
312 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
313 There's a typo in feature-B. We spelled *Zwie* instead of *Zwei*:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
314 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
315 $ hg diff --change tip | grep -F Zwie |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
316 +Zwie |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
317 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
318 Fixing this is very easy. Just change:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
319 |
88
64fe5a4f877e
[evolution] first workign draft of a relocate function
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
87
diff
changeset
|
320 $ sed -i'' -e s/Zwie/Zwei/ main-file-1 |
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
321 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
322 and **amend**:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
323 |
741
892a6d708c8f
amend: drop the deprecated note option
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
718
diff
changeset
|
324 $ hg amend |
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
325 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
326 This results in a new single changeset for our amended changeset, and the old |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
327 changeset plus the updating changeset are hidden from view by default:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
328 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
329 $ hg log |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
330 3 feature-B: another feature (child of 568a468b60fc) - test |
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
331 1 feature-A: a nifty feature - test |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
332 0 : base - test |
87
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
333 |
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
334 $ hg up feature-A -q |
139
9b9500175ae5
evolve that does something \o/
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
138
diff
changeset
|
335 $ hg bookmark -i feature-A |
88
64fe5a4f877e
[evolution] first workign draft of a relocate function
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
87
diff
changeset
|
336 $ sed -i'' -e s/Eins/Un/ main-file-1 |
87
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
337 |
475
9f69a5e41ab0
[evolve] amend: check phase before starting the transition
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
474
diff
changeset
|
338 (amend of public changeset denied) |
9f69a5e41ab0
[evolve] amend: check phase before starting the transition
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
474
diff
changeset
|
339 |
474
5c031e1c90e2
test: turn the base public
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
418
diff
changeset
|
340 $ hg phase --public 0 -v |
5c031e1c90e2
test: turn the base public
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
418
diff
changeset
|
341 phase changed for 1 changesets |
475
9f69a5e41ab0
[evolve] amend: check phase before starting the transition
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
474
diff
changeset
|
342 |
9f69a5e41ab0
[evolve] amend: check phase before starting the transition
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
474
diff
changeset
|
343 |
476
f17a0f801e0b
[evolve] amend: display proper error message while trying to amend non ancestor
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
475
diff
changeset
|
344 (amend of on ancestors) |
f17a0f801e0b
[evolve] amend: display proper error message while trying to amend non ancestor
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
475
diff
changeset
|
345 |
741
892a6d708c8f
amend: drop the deprecated note option
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
718
diff
changeset
|
346 $ hg amend |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
347 1 new orphan changesets |
87
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
348 $ hg log |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
349 4 feature-A: a nifty feature - test |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
350 3 feature-B: another feature (child of 568a468b60fc) - test |
87
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
351 1 : a nifty feature - test |
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
352 0 : base - test |
302
d68ccae92d52
obsolete: make collapse create less markers
Patrick Mezard <patrick@mezard.eu>
parents:
296
diff
changeset
|
353 $ hg up -q 0 |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
354 $ glog --hidden |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
355 o 4:ba0ec09b1bab@default(draft) a nifty feature |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
356 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
357 | * 3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc) |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
358 | | |
1104
cb36a4eb0157
evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1099
diff
changeset
|
359 | | x 2:73296a82292a@default(draft) another feature (child of 568a468b60fc) |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
360 | |/ |
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
361 | x 1:568a468b60fc@default(draft) a nifty feature |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
362 |/ |
474
5c031e1c90e2
test: turn the base public
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
418
diff
changeset
|
363 @ 0:e55e0562ee93@default(public) base |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
364 |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
365 $ hg debugobsolete |
3015
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
366 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
4b951a9a6895
tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
367 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
368 $ hg evolve |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
369 move:[3] another feature (child of 568a468b60fc) |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
370 atop:[4] a nifty feature |
87
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
371 merging main-file-1 |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
372 working directory is now at 99833d22b0c6 |
87
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
373 $ hg log |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
374 5 feature-B: another feature (child of ba0ec09b1bab) - test |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
375 4 feature-A: a nifty feature - test |
87
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
376 0 : base - test |
116
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
377 |
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
378 Test commit -o options |
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
379 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
380 $ hg up -r "desc('a nifty feature')" |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
381 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
382 $ hg revert -r "desc('another feature')" --all |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
383 adding file-from-B |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
384 reverting main-file-1 |
116
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
385 $ sed -i'' -e s/Zwei/deux/ main-file-1 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
386 $ hg commit -m 'another feature that rox' -o 5 |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
387 created new head |
116
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
388 $ hg log |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
389 6 feature-B: another feature that rox - test |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
390 4 feature-A: a nifty feature - test |
116
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
391 0 : base - test |
309
de21685d22d1
evolve: warn when latecomer changeset are created
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
302
diff
changeset
|
392 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
393 phase change turning obsolete changeset public issue a bumped warning |
309
de21685d22d1
evolve: warn when latecomer changeset are created
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
302
diff
changeset
|
394 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
395 $ hg phase --hidden --public 99833d22b0c6 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
396 1 new phase-divergent changesets |
309
de21685d22d1
evolve: warn when latecomer changeset are created
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
302
diff
changeset
|
397 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
398 all solving bumped troubled |
468
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
399 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
400 $ glog |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
401 @ 6:47d52a103155@default(draft) another feature that rox |
468
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
402 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
403 | o 5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab) |
468
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
404 |/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
405 o 4:ba0ec09b1bab@default(public) a nifty feature |
468
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
406 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
407 o 0:e55e0562ee93@default(public) base |
468
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
408 |
3155
b237c1c6dc19
evolve: rename --phasedivergent flag to --phase-divergent
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3075
diff
changeset
|
409 $ hg evolve --any --traceback --phase-divergent |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
410 recreate:[6] another feature that rox |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
411 atop:[5] another feature (child of ba0ec09b1bab) |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
412 computing new diff |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
413 committed as aca219761afb |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
414 working directory is now at aca219761afb |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
415 $ glog |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
416 @ 7:aca219761afb@default(draft) phase-divergent update to 99833d22b0c6: |
468
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
417 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
418 o 5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab) |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
419 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
420 o 4:ba0ec09b1bab@default(public) a nifty feature |
468
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
421 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
422 o 0:e55e0562ee93@default(public) base |
468
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
423 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
424 $ hg diff --hidden -r aca219761afb -r 47d52a103155 |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
425 $ hg diff -r aca219761afb^ -r aca219761afb |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
426 diff --git a/main-file-1 b/main-file-1 |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
427 --- a/main-file-1 |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
428 +++ b/main-file-1 |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
429 @@ -3,1 +3,1 @@ |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
430 -Zwei |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
431 +deux |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
432 $ hg log -r 'phasedivergent()' # no more bumped |
468
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
433 |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
434 test evolve --all |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
435 $ sed -i'' -e s/deux/to/ main-file-1 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
436 $ hg commit -m 'dansk 2!' |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
437 $ sed -i'' -e s/Three/tre/ main-file-1 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
438 $ hg commit -m 'dansk 3!' |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
439 $ hg update aca219761afb |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
440 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
441 $ sed -i'' -e s/Un/Én/ main-file-1 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
442 $ hg commit --amend -m 'dansk!' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
443 2 new orphan changesets |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
444 |
1399
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
445 (ninja test for the {trouble} template: |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
446 |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
447 $ hg log -G --template '{rev} {troubles}\n' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
448 @ 10 |
1399
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
449 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
450 | * 9 orphan |
1399
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
451 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
452 | * 8 orphan |
1399
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
453 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
454 | x 7 |
1399
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
455 |/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
456 o 5 |
1399
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
457 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
458 o 4 |
1399
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
459 | |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
460 o 0 |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
461 |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
462 |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
463 |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
464 (/ninja) |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
465 |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
466 $ hg evolve --all --traceback |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
467 move:[8] dansk 2! |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
468 atop:[10] dansk! |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
469 merging main-file-1 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
470 move:[9] dansk 3! |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
471 atop:[11] dansk 2! |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
472 merging main-file-1 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
473 working directory is now at 96abb1319a47 |
2776
4dd84054ebbb
test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2767
diff
changeset
|
474 $ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
475 @ 12 : dansk 3! - test |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
476 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
477 o 11 : dansk 2! - test |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
478 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
479 o 10 feature-B: dansk! - test |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
480 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
481 o 5 : another feature (child of ba0ec09b1bab) - test |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
482 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
483 o 4 feature-A: a nifty feature - test |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
484 | |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
485 o 0 : base - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
486 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
487 |
196
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
488 $ cd .. |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
489 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
490 enable general delta |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
491 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
492 $ cat << EOF >> $HGRCPATH |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
493 > [format] |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
494 > generaldelta=1 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
495 > EOF |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
496 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
497 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
498 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
499 $ hg init alpha |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
500 $ cd alpha |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
501 $ echo 'base' > firstfile |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
502 $ hg add firstfile |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
503 $ hg ci -m 'base' |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
504 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
505 $ cd .. |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
506 $ hg clone -Ur 0 alpha beta |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
507 adding changesets |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
508 adding manifests |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
509 adding file changes |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
510 added 1 changesets with 1 changes to 1 files |
3075
8feb2cae7eae
test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3015
diff
changeset
|
511 new changesets 702e4d0a6d86 |
196
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
512 $ cd alpha |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
513 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
514 $ cat << EOF > A |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
515 > We |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
516 > need |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
517 > some |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
518 > kind |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
519 > of |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
520 > file |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
521 > big |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
522 > enough |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
523 > to |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
524 > prevent |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
525 > snapshot |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
526 > . |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
527 > yes |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
528 > new |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
529 > lines |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
530 > are |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
531 > useless |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
532 > . |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
533 > EOF |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
534 $ hg add A |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
535 $ hg commit -m 'adding A' |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
536 $ hg mv A B |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
537 $ echo '.' >> B |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
538 $ hg amend -m 'add B' |
219
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
539 $ hg verify |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
540 checking changesets |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
541 checking manifests |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
542 crosschecking files in changesets and manifests |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
543 checking files |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
544 3 files, 3 changesets, 3 total revisions |
219
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
545 $ hg --config extensions.hgext.mq= strip 'extinct()' |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
546 abort: empty revision set |
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
547 [255] |
2564
cda34aeb01d7
test-evolve: garbage collection changeset only, not obsmarkers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2547
diff
changeset
|
548 (do some garbare collection) |
cda34aeb01d7
test-evolve: garbage collection changeset only, not obsmarkers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2547
diff
changeset
|
549 $ hg --config extensions.hgext.mq= strip --hidden 'extinct()' --config devel.strip-obsmarkers=no |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
550 saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-a365b072-backup.hg (glob) |
219
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
551 $ hg verify |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
552 checking changesets |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
553 checking manifests |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
554 crosschecking files in changesets and manifests |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
555 checking files |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
556 2 files, 2 changesets, 2 total revisions |
196
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
557 $ cd .. |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
558 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
559 Clone just this branch |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
560 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
561 $ cd beta |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
562 $ hg pull -r tip ../alpha |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
563 pulling from ../alpha |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
564 searching for changes |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
565 adding changesets |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
566 adding manifests |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
567 adding file changes |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
568 added 1 changesets with 1 changes to 1 files |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
569 1 new obsolescence markers |
3075
8feb2cae7eae
test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3015
diff
changeset
|
570 new changesets c6dda801837c |
196
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
571 (run 'hg update' to get a working copy) |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
572 $ hg up |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
573 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
574 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
575 $ cd .. |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
576 |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
577 Normal testing |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
578 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
579 $ hg init test-graft |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
580 $ cd test-graft |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
581 $ mkcommit 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
582 $ mkcommit 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
583 $ mkcommit 2 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
584 $ mkcommit 3 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
585 $ hg up -qC 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
586 $ mkcommit 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
587 created new head |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
588 $ glog --hidden |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
589 @ 4:ce341209337f@default(draft) add 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
590 | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
591 | o 3:0e84df4912da@default(draft) add 3 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
592 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
593 | o 2:db038628b9e5@default(draft) add 2 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
594 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
595 | o 1:73d38bb17fd7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
596 |/ |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
597 o 0:8685c6d34325@default(draft) add 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
598 |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
599 $ hg grab -r3 |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
600 grabbing 3:0e84df4912da "add 3" |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
601 $ hg graft -r1 |
1188
0c879e986ce4
test: adapt to core change in graft and rebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
602 grafting 1:73d38bb17fd7 "add 1" |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
603 $ hg prune -r2 --succ . |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
604 1 changesets pruned |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
605 $ glog --hidden |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
606 @ 6:417185465d2c@default(draft) add 1 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
607 | |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
608 o 5:fa455b5098e0@default(draft) add 3 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
609 | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
610 o 4:ce341209337f@default(draft) add 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
611 | |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
612 | x 3:0e84df4912da@default(draft) add 3 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
613 | | |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
614 | x 2:db038628b9e5@default(draft) add 2 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
615 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
616 | o 1:73d38bb17fd7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
617 |/ |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
618 o 0:8685c6d34325@default(draft) add 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
619 |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
620 $ hg debugobsolete |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
621 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'grab', 'user': 'test'} |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
622 db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
623 |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
624 Test grab --continue |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
625 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
626 $ hg up -qC 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
627 $ echo 2 > 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
628 $ hg ci -Am conflict 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
629 created new head |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
630 $ hg up -qC 6 |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
631 $ hg grab -r 7 |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
632 grabbing 7:a5bfd90a2f29 "conflict" |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
633 merging 1 |
1516
c4f8a2916e43
tests: run test with 3.6 and apply test change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1510
diff
changeset
|
634 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
635 unresolved merge conflicts (see hg help resolve) |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
636 [1] |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
637 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
1732
f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents:
1731
diff
changeset
|
638 7:a5bfd90a2f29 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
639 $ echo 3 > 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
640 $ hg resolve -m 1 |
1026
35adaf02b777
test: apply message changes introduced by mercurial 3.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
950
diff
changeset
|
641 (no more unresolved files) |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
642 continue: hg grab --continue |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
643 $ hg grab --continue |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
644 $ glog --hidden |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
645 @ 8:fb2c0f0a0c54@default(draft) conflict |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
646 | |
420 | 647 | x 7:a5bfd90a2f29@default(draft) conflict |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
648 | | |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
649 o | 6:417185465d2c@default(draft) add 1 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
650 | | |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
651 o | 5:fa455b5098e0@default(draft) add 3 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
652 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
653 o | 4:ce341209337f@default(draft) add 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
654 |/ |
420 | 655 | x 3:0e84df4912da@default(draft) add 3 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
656 | | |
420 | 657 | x 2:db038628b9e5@default(draft) add 2 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
658 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
659 | o 1:73d38bb17fd7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
660 |/ |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
661 o 0:8685c6d34325@default(draft) add 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
662 |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
663 $ hg debugobsolete |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
664 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'grab', 'user': 'test'} |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
665 db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
666 a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 fb2c0f0a0c54be4367988521bad2cbd33a540969 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'grab', 'user': 'test'} |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
667 |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
668 Test touch |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
669 |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
670 $ glog |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
671 @ 8:fb2c0f0a0c54@default(draft) conflict |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
672 | |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
673 o 6:417185465d2c@default(draft) add 1 |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
674 | |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
675 o 5:fa455b5098e0@default(draft) add 3 |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
676 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
677 o 4:ce341209337f@default(draft) add 4 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
678 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
679 | o 1:73d38bb17fd7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
680 |/ |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
681 o 0:8685c6d34325@default(draft) add 0 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
682 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
683 $ hg touch |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
684 $ glog |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
685 @ 9:*@default(draft) conflict (glob) |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
686 | |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
687 o 6:417185465d2c@default(draft) add 1 |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
688 | |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
689 o 5:fa455b5098e0@default(draft) add 3 |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
690 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
691 o 4:ce341209337f@default(draft) add 4 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
692 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
693 | o 1:73d38bb17fd7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
694 |/ |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
695 o 0:8685c6d34325@default(draft) add 0 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
696 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
697 $ hg touch . |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
698 $ glog |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
699 @ 10:*@default(draft) conflict (glob) |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
700 | |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
701 o 6:417185465d2c@default(draft) add 1 |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
702 | |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
703 o 5:fa455b5098e0@default(draft) add 3 |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
704 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
705 o 4:ce341209337f@default(draft) add 4 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
706 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
707 | o 1:73d38bb17fd7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
708 |/ |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
709 o 0:8685c6d34325@default(draft) add 0 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
710 |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
711 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
712 Test fold |
2767
ab80ef8d0cfa
test: extract most fold testing into a test-fold module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
713 (most of the testing have been moved to test-fold |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
714 |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
715 $ rm *.orig |
997
f48cd2f48d14
fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
996
diff
changeset
|
716 $ hg phase --public 0 |
1782
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
717 $ hg fold --from -r 5 |
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
718 3 changesets folded |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
719 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
720 $ hg log -r 11 --template '{desc}\n' |
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
721 add 3 |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
722 |
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
723 |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
724 add 1 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
725 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
726 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
727 conflict |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
728 $ hg debugrebuildstate |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
729 $ hg st |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
730 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
731 Test fold with wc parent is not the head of the folded revision |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
732 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
733 $ hg up 4 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
734 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
735 $ hg fold --rev 4::11 --user victor --exact |
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
736 2 changesets folded |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
737 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
738 $ glog |
915
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
739 @ 12:d26d339c513f@default(draft) add 4 |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
740 | |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
741 | o 1:73d38bb17fd7@default(draft) add 1 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
742 |/ |
997
f48cd2f48d14
fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
996
diff
changeset
|
743 o 0:8685c6d34325@default(public) add 0 |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
744 |
915
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
745 $ hg log --template '{rev}: {author}\n' |
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
746 12: victor |
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
747 1: test |
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
748 0: test |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
749 $ hg log -r 12 --template '{desc}\n' |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
750 add 4 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
751 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
752 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
753 add 3 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
754 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
755 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
756 add 1 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
757 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
758 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
759 conflict |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
760 $ hg debugrebuildstate |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
761 $ hg st |
483
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
762 |
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
763 Test olog |
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
764 |
2426
0751c8f6005d
test: reduce output size to fight unstability
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2416
diff
changeset
|
765 $ hg olog | head -n 10 # hg touch makes the output unstable (fix it with devel option for more stable touch) |
2416
23c0bef0b5d4
obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
766 @ d26d339c513f (12) add 4 |
23c0bef0b5d4
obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
767 |\ |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
768 x | ce341209337f (4) add 4 |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
769 / rewritten(description, user, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
770 | |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
771 x cf0c3904643c (11) add 3 |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
772 |\ rewritten(description, user, parent, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
773 | | |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
774 | \ |
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
775 | |\ |
901
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
776 |
807
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
777 Test obsstore stat |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
778 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
779 $ hg debugobsstorestat |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
780 markers total: 10 |
2547
3c594000844b
debugobsstorestat: adds static about actually obsolete changeses
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2501
diff
changeset
|
781 for known precursors: 10 (10/13 obsolete changesets) |
809
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
782 with parents data: 0 |
807
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
783 markers with no successors: 0 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
784 1 successors: 10 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
785 2 successors: 0 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
786 more than 2 successors: 0 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
787 available keys: |
2572
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
788 ef1: 10 |
3568
eca57332ad03
touch: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3564
diff
changeset
|
789 operation: 10 |
807
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
790 user: 10 |
2440
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
791 marker size: |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
792 format v1: |
3568
eca57332ad03
touch: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3564
diff
changeset
|
793 smallest length: 90 |
3561
4701e8888c4f
amend: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
794 longer length: 92 |
3564
589649021ea1
fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3561
diff
changeset
|
795 median length: 91 |
3599
5a796d753427
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3568
diff
changeset
|
796 mean length: 90 |
2440
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
797 format v0: |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
798 smallest length: * (glob) |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
799 longer length: * (glob) |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
800 median length: * (glob) |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
801 mean length: * (glob) |
809
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
802 disconnected clusters: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
803 any known node: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
804 smallest length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
805 longer length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
806 median length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
807 mean length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
808 using parents data: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
809 any known node: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
810 smallest length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
811 longer length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
812 median length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
813 mean length: 10 |
907 | 814 |
901
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
815 |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
816 Test evolving renames |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
817 |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
818 $ hg up null |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
819 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
820 $ echo a > a |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
821 $ hg ci -Am a |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
822 adding a |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
823 created new head |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
824 $ echo b > b |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
825 $ hg ci -Am b |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
826 adding b |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
827 $ hg mv a c |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
828 $ hg ci -m c |
1631
7463f5880ce9
prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1594
diff
changeset
|
829 $ hg prune .^ |
901
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
830 1 changesets pruned |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
831 1 new orphan changesets |
901
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
832 $ hg stab --any |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
833 move:[15] c |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
834 atop:[13] a |
1099
bac4e0bc9f6a
evolve: write a status message when the working directory changes
David Soria Parra <davidsp@fb.com>
parents:
1067
diff
changeset
|
835 working directory is now at 3742bde73477 |
901
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
836 $ hg st -C --change=tip |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
837 A c |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
838 a |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
839 R a |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
840 |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
841 Test fold with commit messages |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
842 |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
843 $ cd ../work |
1782
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
844 $ hg fold --from .^ --message "Folding with custom commit message" |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
845 2 changesets folded |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
846 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
847 $ glog |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
848 @ 13:284c0d45770d@default(draft) Folding with custom commit message |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
849 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
850 o 10:9975c016fe7b@default(draft) dansk! |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
851 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
852 o 5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab) |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
853 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
854 o 4:ba0ec09b1bab@default(public) a nifty feature |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
855 | |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
856 o 0:e55e0562ee93@default(public) base |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
857 |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
858 $ cat > commit-message <<EOF |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
859 > A longer |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
860 > commit message |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
861 > EOF |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
862 |
1782
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
863 $ hg fold --from .^ --logfile commit-message |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
864 2 changesets folded |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
865 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
866 $ hg qlog |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
867 14 - 8693d0f277b8 A longer |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
868 commit message (draft) |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
869 5 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public) |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
870 4 - ba0ec09b1bab a nifty feature (public) |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
871 0 - e55e0562ee93 base (public) |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
872 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
873 $ cd .. |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
874 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
875 Test branch preservation: |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
876 =========================== |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
877 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
878 $ hg init evolving-branch |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
879 $ cd evolving-branch |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
880 $ touch a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
881 $ hg add a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
882 $ hg ci -m 'a0' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
883 $ echo 1 > a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
884 $ hg ci -m 'a1' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
885 $ echo 2 > a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
886 $ hg ci -m 'a2' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
887 $ echo 3 > a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
888 $ hg ci -m 'a3' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
889 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
890 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
891 @ 3 [default] a3 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
892 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
893 o 2 [default] a2 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
894 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
895 o 1 [default] a1 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
896 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
897 o 0 [default] a0 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
898 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
899 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
900 branch change propagated |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
901 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
902 $ hg up 'desc(a2)' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
903 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
904 $ hg branch mybranch |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
905 marked working directory as branch mybranch |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
906 (branches are permanent and global, did you want a bookmark?) |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
907 $ hg amend |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
908 1 new orphan changesets |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
909 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
910 $ hg evolve |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
911 move:[3] a3 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
912 atop:[4] a2 |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
913 working directory is now at 7c5649f73d11 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
914 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
915 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
916 @ 5 [mybranch] a3 |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
917 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
918 o 4 [mybranch] a2 |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
919 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
920 o 1 [default] a1 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
921 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
922 o 0 [default] a0 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
923 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
924 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
925 branch change preserved |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
926 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
927 $ hg up 'desc(a1)' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
928 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
929 $ hg amend -m 'a1_' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
930 2 new orphan changesets |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
931 $ hg evolve |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
932 move:[4] a2 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
933 atop:[6] a1_ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
934 working directory is now at eb07e22a0e63 |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
935 $ hg evolve |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
936 move:[5] a3 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
937 atop:[7] a2 |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
938 working directory is now at 777c26ca5e78 |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
939 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
940 @ 8 [mybranch] a3 |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
941 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
942 o 7 [mybranch] a2 |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
943 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
944 o 6 [default] a1_ |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
945 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
946 o 0 [default] a0 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
947 |
1157
5951969400ce
evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1141
diff
changeset
|
948 |
5951969400ce
evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1141
diff
changeset
|
949 Evolve from the middle of a stack pick the right changesets. |
5951969400ce
evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1141
diff
changeset
|
950 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
951 $ hg up -r "desc('a1_')" |
1157
5951969400ce
evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1141
diff
changeset
|
952 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5951969400ce
evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1141
diff
changeset
|
953 $ hg ci --amend -m 'a1__' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
954 2 new orphan changesets |
1157
5951969400ce
evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1141
diff
changeset
|
955 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
956 $ hg up -r "desc('a2')" |
1157
5951969400ce
evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1141
diff
changeset
|
957 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1422
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
958 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
959 o 9 [default] a1__ |
1422
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
960 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
961 | * 8 [mybranch] a3 |
1422
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
962 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
963 | @ 7 [mybranch] a2 |
1422
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
964 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
965 | x 6 [default] a1_ |
1422
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
966 |/ |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
967 o 0 [default] a0 |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
968 |
1157
5951969400ce
evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1141
diff
changeset
|
969 $ hg evolve |
1410
2c451fece7a6
evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1406
diff
changeset
|
970 nothing to evolve on current working copy parent |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
971 (2 other orphan in the repository, do you want --any or --rev) |
1157
5951969400ce
evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1141
diff
changeset
|
972 [2] |
1194
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
973 |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
974 |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
975 Evolve disables active bookmarks. |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
976 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
977 $ hg up -r "desc('a1__')" |
1194
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
978 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
979 $ hg bookmark testbookmark |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
980 $ ls .hg/bookmarks* |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
981 .hg/bookmarks |
1330
efb75f4d55aa
bookmarks: update to use new bookmarks api via compatibility layer
Ryan McElroy <rmcelroy@fb.com>
parents:
1279
diff
changeset
|
982 .hg/bookmarks.* (glob) |
1194
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
983 $ hg evolve |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
984 move:[7] a2 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
985 atop:[9] a1__ |
1194
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
986 (leaving bookmark testbookmark) |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
987 working directory is now at d952e93add6f |
1194
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
988 $ ls .hg/bookmarks* |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
989 .hg/bookmarks |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
990 $ glog |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
991 @ 10:d952e93add6f@mybranch(draft) a2 |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
992 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
993 o 9:9f8b83c2e7f3@default(draft) a1__ |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
994 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
995 | * 8:777c26ca5e78@mybranch(draft) a3 |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
996 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
997 | x 7:eb07e22a0e63@mybranch(draft) a2 |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
998 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
999 | x 6:faafc6cea0ba@default(draft) a1_ |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1000 |/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1001 o 0:07c1c36d9ef0@default(draft) a0 |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1002 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1003 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1004 Possibility to select what trouble to solve first, asking for bumped before |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1005 divergent |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1006 $ hg up -r "desc('a1__')" |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1007 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1008 $ hg revert -r d952e93add6f --all |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1009 reverting a |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1010 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1011 o 10 [mybranch] a2 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1012 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1013 @ 9 [default] a1__ |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1014 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
1015 | * 8 [mybranch] a3 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1016 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1017 | x 7 [mybranch] a2 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1018 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1019 | x 6 [default] a1_ |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1020 |/ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1021 o 0 [default] a0 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1022 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1023 $ echo "hello world" > newfile |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1024 $ hg add newfile |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1025 $ hg commit -m "add new file bumped" -o 10 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1026 $ hg phase --public --hidden d952e93add6f |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1027 1 new phase-divergent changesets |
2776
4dd84054ebbb
test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2767
diff
changeset
|
1028 $ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1029 @ 11 : add new file bumped - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1030 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1031 | o 10 : a2 - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1032 |/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1033 o 9 testbookmark: a1__ - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1034 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
1035 | * 8 : a3 - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1036 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1037 | x 7 : a2 - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1038 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1039 | x 6 : a1_ - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1040 |/ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1041 o 0 : a0 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1042 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1043 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1044 Now we have a bumped and an unstable changeset, we solve the bumped first |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1045 normally the unstable changeset would be solve first |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1046 |
2776
4dd84054ebbb
test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2767
diff
changeset
|
1047 $ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1048 @ 11 : add new file bumped - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1049 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1050 | o 10 : a2 - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1051 |/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1052 o 9 testbookmark: a1__ - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1053 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
1054 | * 8 : a3 - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1055 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1056 | x 7 : a2 - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1057 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1058 | x 6 : a1_ - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1059 |/ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1060 o 0 : a0 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1061 |
3155
b237c1c6dc19
evolve: rename --phasedivergent flag to --phase-divergent
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3075
diff
changeset
|
1062 $ hg evolve -r "desc('add new file bumped')" --phase-divergent |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1063 recreate:[11] add new file bumped |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1064 atop:[10] a2 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1065 computing new diff |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1066 committed as a8bb31d4b7f2 |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1067 working directory is now at a8bb31d4b7f2 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1068 $ hg evolve --any |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1069 move:[8] a3 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1070 atop:[12] phase-divergent update to d952e93add6f: |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1071 working directory is now at b88539ad24d7 |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1072 $ glog |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1073 @ 13:b88539ad24d7@default(draft) a3 |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1074 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1075 o 12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f: |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1076 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1077 o 10:d952e93add6f@mybranch(public) a2 |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1078 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1079 o 9:9f8b83c2e7f3@default(public) a1__ |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1080 | |
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1081 o 0:07c1c36d9ef0@default(public) a0 |
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1082 |
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1083 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1084 Check that we can resolve troubles in a revset with more than one commit |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1085 $ hg up b88539ad24d7 -C |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1086 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1087 $ mkcommit gg |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1088 $ hg up b88539ad24d7 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1089 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1090 $ mkcommit gh |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1091 created new head |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1092 $ hg up b88539ad24d7 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1093 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1406
5a91ee6a42e6
test-evolve: fix tests failing on some platform
Laurent Charignon <lcharignon@fb.com>
parents:
1405
diff
changeset
|
1094 $ printf "newline\nnewline\n" >> a |
2776
4dd84054ebbb
test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2767
diff
changeset
|
1095 $ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1096 o 15 : add gh - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1097 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1098 | o 14 : add gg - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1099 |/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1100 @ 13 : a3 - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1101 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1102 o 12 : phase-divergent update to d952e93add6f: - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1103 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1104 o 10 : a2 - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1105 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1106 o 9 testbookmark: a1__ - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1107 | |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1108 o 0 : a0 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1109 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1110 $ hg amend |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1111 2 new orphan changesets |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1112 $ glog |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1113 @ 16:0cf3707e8971@default(draft) a3 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1114 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
1115 | * 15:daa1ff1c7fbd@default(draft) add gh |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1116 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
1117 | | * 14:484fb3cfa7f2@default(draft) add gg |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1118 | |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1119 | x 13:b88539ad24d7@default(draft) a3 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1120 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1121 o 12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f: |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1122 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1123 o 10:d952e93add6f@mybranch(public) a2 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1124 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1125 o 9:9f8b83c2e7f3@default(public) a1__ |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1126 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1127 o 0:07c1c36d9ef0@default(public) a0 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1128 |
1349
70681abf79d1
evolve: move return statement at the right level
Laurent Charignon <lcharignon@fb.com>
parents:
1336
diff
changeset
|
1129 |
70681abf79d1
evolve: move return statement at the right level
Laurent Charignon <lcharignon@fb.com>
parents:
1336
diff
changeset
|
1130 Evolving an empty revset should do nothing |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1131 $ hg evolve --rev "daa1ff1c7fbd and 484fb3cfa7f2" |
1410
2c451fece7a6
evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1406
diff
changeset
|
1132 set of specified revisions is empty |
2c451fece7a6
evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1406
diff
changeset
|
1133 [1] |
1349
70681abf79d1
evolve: move return statement at the right level
Laurent Charignon <lcharignon@fb.com>
parents:
1336
diff
changeset
|
1134 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1135 $ hg evolve --rev "b88539ad24d7::" --phase-divergent |
2836
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
1136 no phasedivergent changesets in specified revisions |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
1137 (do you want to use --orphan) |
1410
2c451fece7a6
evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1406
diff
changeset
|
1138 [2] |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1139 $ hg evolve --rev "b88539ad24d7::" --orphan |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1140 move:[14] add gg |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1141 atop:[16] a3 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1142 move:[15] add gh |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1143 atop:[16] a3 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1144 working directory is now at 0c049e4e5422 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1145 $ glog |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1146 @ 18:0c049e4e5422@default(draft) add gh |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1147 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1148 | o 17:98e171e2f272@default(draft) add gg |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1149 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1150 o 16:0cf3707e8971@default(draft) a3 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1151 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1152 o 12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f: |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1153 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1154 o 10:d952e93add6f@mybranch(public) a2 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1155 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1156 o 9:9f8b83c2e7f3@default(public) a1__ |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1157 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1158 o 0:07c1c36d9ef0@default(public) a0 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1159 |
1441
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1160 Enabling commands selectively, no command enabled, next and fold and unknown |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1161 $ cat >> $HGRCPATH <<EOF |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1162 > [experimental] |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1163 > evolution=createmarkers |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1164 > EOF |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1165 $ hg next |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1166 hg: unknown command 'next' |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1167 Mercurial Distributed SCM |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1168 |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1169 basic commands: |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1170 |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1171 add add the specified files on the next commit |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1172 annotate show changeset information by line for each file |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1173 clone make a copy of an existing repository |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1174 commit commit the specified files or all outstanding changes |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1175 diff diff repository (or selected files) |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1176 export dump the header and diffs for one or more changesets |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1177 forget forget the specified files on the next commit |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1178 init create a new repository in the given directory |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1179 log show revision history of entire repository or files |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1180 merge merge another revision into working directory |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1181 pull pull changes from the specified source |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1182 push push changes to the specified destination |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1183 remove remove the specified files on the next commit |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1184 serve start stand-alone webserver |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1185 status show changed files in the working directory |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1186 summary summarize working directory state |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1187 update update working directory (or switch revisions) |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1188 |
1737
5383671ef612
evolve: fix test breaks related to double->single quote changes
Kostia Balytskyi <ikostia@fb.com>
parents:
1736
diff
changeset
|
1189 (use 'hg help' for the full list of commands or 'hg -v' for details) |
1441
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1190 [255] |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1191 $ hg fold |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1192 hg: unknown command 'fold' |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1193 Mercurial Distributed SCM |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1194 |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1195 basic commands: |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1196 |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1197 add add the specified files on the next commit |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1198 annotate show changeset information by line for each file |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1199 clone make a copy of an existing repository |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1200 commit commit the specified files or all outstanding changes |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1201 diff diff repository (or selected files) |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1202 export dump the header and diffs for one or more changesets |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1203 forget forget the specified files on the next commit |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1204 init create a new repository in the given directory |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1205 log show revision history of entire repository or files |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1206 merge merge another revision into working directory |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1207 pull pull changes from the specified source |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1208 push push changes to the specified destination |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1209 remove remove the specified files on the next commit |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1210 serve start stand-alone webserver |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1211 status show changed files in the working directory |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1212 summary summarize working directory state |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1213 update update working directory (or switch revisions) |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1214 |
1737
5383671ef612
evolve: fix test breaks related to double->single quote changes
Kostia Balytskyi <ikostia@fb.com>
parents:
1736
diff
changeset
|
1215 (use 'hg help' for the full list of commands or 'hg -v' for details) |
1441
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1216 [255] |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1217 Enabling commands selectively, only fold enabled, next is still unknown |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1218 $ cat >> $HGRCPATH <<EOF |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1219 > [experimental] |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1220 > evolution=createmarkers |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1221 > evolutioncommands=fold |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1222 > EOF |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1223 $ hg fold |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1224 abort: no revisions specified |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1225 [255] |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1226 $ hg next |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1227 hg: unknown command 'next' |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1228 Mercurial Distributed SCM |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1229 |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1230 basic commands: |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1231 |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1232 add add the specified files on the next commit |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1233 annotate show changeset information by line for each file |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1234 clone make a copy of an existing repository |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1235 commit commit the specified files or all outstanding changes |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1236 diff diff repository (or selected files) |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1237 export dump the header and diffs for one or more changesets |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1238 fold fold multiple revisions into a single one |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1239 forget forget the specified files on the next commit |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1240 init create a new repository in the given directory |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1241 log show revision history of entire repository or files |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1242 merge merge another revision into working directory |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1243 pull pull changes from the specified source |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1244 push push changes to the specified destination |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1245 remove remove the specified files on the next commit |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1246 serve start stand-alone webserver |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1247 status show changed files in the working directory |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1248 summary summarize working directory state |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1249 update update working directory (or switch revisions) |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1250 |
1737
5383671ef612
evolve: fix test breaks related to double->single quote changes
Kostia Balytskyi <ikostia@fb.com>
parents:
1736
diff
changeset
|
1251 (use 'hg help' for the full list of commands or 'hg -v' for details) |
1441
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1252 [255] |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1253 |
3455
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1254 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1255 |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1256 $ hg --hidden up 14 |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1257 updating to a hidden changeset 484fb3cfa7f2 |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1258 (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1259 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1260 working directory parent is obsolete! (484fb3cfa7f2) |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1261 $ cat >> $HGRCPATH <<EOF |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1262 > [experimental] |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1263 > evolutioncommands=evolve |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1264 > EOF |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1265 $ hg --hidden up 15 |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1266 updating to a hidden changeset daa1ff1c7fbd |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1267 (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1268 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1269 working directory parent is obsolete! (daa1ff1c7fbd) |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1270 (use 'hg evolve' to update to its successor: 0c049e4e5422) |
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1271 |
1441
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1272 Restore all of the evolution features |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1273 |
1441
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1274 $ cat >> $HGRCPATH <<EOF |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1275 > [experimental] |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1276 > evolution=all |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1277 > EOF |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1278 |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1279 Check hg evolve --rev on singled out commit |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1280 $ hg up 98e171e2f272 -C |
3455
f7ecb11d71bb
update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
1281 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1282 $ mkcommit j1 |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1283 $ mkcommit j2 |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1284 $ mkcommit j3 |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1285 $ hg up .^^ |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1286 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1287 $ echo "hello" > j4 |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1288 $ hg add j4 |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1289 $ hg amend |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1290 2 new orphan changesets |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1291 $ glog -r "0cf3707e8971::" |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1292 @ 22:274b6cd0c101@default(draft) add j1 |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1293 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
1294 | * 21:89e4f7e8feb5@default(draft) add j3 |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1295 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
1296 | * 20:4cd61236beca@default(draft) add j2 |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1297 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1298 | x 19:0fd8bfb02de4@default(draft) add j1 |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1299 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1300 | o 18:0c049e4e5422@default(draft) add gh |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1364
diff
changeset
|
1301 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1302 o | 17:98e171e2f272@default(draft) add gg |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1364
diff
changeset
|
1303 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1304 o 16:0cf3707e8971@default(draft) a3 |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1305 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1306 ~ |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1307 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1308 $ hg evolve --rev 89e4f7e8feb5 --any |
1405
eaf82490af76
evolve: prevent using --rev and --any together
Laurent Charignon <lcharignon@fb.com>
parents:
1404
diff
changeset
|
1309 abort: cannot specify both "--rev" and "--any" |
eaf82490af76
evolve: prevent using --rev and --any together
Laurent Charignon <lcharignon@fb.com>
parents:
1404
diff
changeset
|
1310 [255] |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1311 $ hg evolve --rev 89e4f7e8feb5 |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1312 cannot solve instability of 89e4f7e8feb5, skipping |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1313 |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1314 Check that uncommit respects the allowunstable option |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1315 With only createmarkers we can only uncommit on a head |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1316 $ cat >> $HGRCPATH <<EOF |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1317 > [experimental] |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1318 > evolution=createmarkers, allnewcommands |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1319 > EOF |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1320 $ hg up 274b6cd0c101^ |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1364
diff
changeset
|
1321 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1322 $ hg uncommit --all |
2788
554c069cdc85
uncommit: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2782
diff
changeset
|
1323 abort: uncommit will orphan 4 descendants |
554c069cdc85
uncommit: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2782
diff
changeset
|
1324 (see 'hg help evolution.instability') |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1325 [255] |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1326 $ hg up 274b6cd0c101 |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1364
diff
changeset
|
1327 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1328 $ hg uncommit --all |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1329 new changeset is empty |
1756
a7dcfff8c4a9
evolve: use single quotes in usage messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
1753
diff
changeset
|
1330 (use 'hg prune .' to remove it) |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1331 $ glog -r "0cf3707e8971::" |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1332 @ 23:0ef9ff75f8e2@default(draft) add j1 |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1333 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
1334 | * 21:89e4f7e8feb5@default(draft) add j3 |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1364
diff
changeset
|
1335 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
1336 | * 20:4cd61236beca@default(draft) add j2 |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1337 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1338 | x 19:0fd8bfb02de4@default(draft) add j1 |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1364
diff
changeset
|
1339 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1340 | o 18:0c049e4e5422@default(draft) add gh |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1341 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1342 o | 17:98e171e2f272@default(draft) add gg |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1343 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1344 o 16:0cf3707e8971@default(draft) a3 |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1345 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1346 ~ |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1347 |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1348 Check that prune respects the allowunstable option |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1349 $ hg up -C . |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1350 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1351 $ hg up 0c049e4e5422 |
1422
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
1352 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
1353 $ hg evolve --all |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
1354 nothing to evolve on current working copy parent |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2832
diff
changeset
|
1355 (2 other orphan in the repository, do you want --any or --rev) |
1422
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
1356 [2] |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
1357 $ hg evolve --all --any |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1358 move:[20] add j2 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1359 atop:[23] add j1 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1360 move:[21] add j3 |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1361 atop:[24] add j2 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1362 working directory is now at 0d9203b74542 |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1363 $ glog -r "0cf3707e8971::" |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1364 @ 25:0d9203b74542@default(draft) add j3 |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1365 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1366 o 24:f1b85956c48c@default(draft) add j2 |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1367 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1368 o 23:0ef9ff75f8e2@default(draft) add j1 |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1369 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1370 | o 18:0c049e4e5422@default(draft) add gh |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1371 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1372 o | 17:98e171e2f272@default(draft) add gg |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1373 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1374 o 16:0cf3707e8971@default(draft) a3 |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1375 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1376 ~ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1377 $ hg up 98e171e2f272 |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1378 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1379 $ mkcommit c5_ |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1380 created new head |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1381 $ hg prune '0ef9ff75f8e2 + f1b85956c48c' |
2789
06ee4ec88190
prune: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2788
diff
changeset
|
1382 abort: touch will orphan 1 descendants |
06ee4ec88190
prune: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2788
diff
changeset
|
1383 (see 'hg help evolution.instability') |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1384 [255] |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1385 $ hg prune '98e171e2f272::0d9203b74542' |
2789
06ee4ec88190
prune: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2788
diff
changeset
|
1386 abort: touch will orphan 1 descendants |
06ee4ec88190
prune: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2788
diff
changeset
|
1387 (see 'hg help evolution.instability') |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1388 [255] |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1389 $ hg prune '0ef9ff75f8e2::' |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1390 3 changesets pruned |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1391 $ glog -r "0cf3707e8971::" |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1392 @ 26:4c6f6f6d1976@default(draft) add c5_ |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1393 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1394 | o 18:0c049e4e5422@default(draft) add gh |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1395 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1396 o | 17:98e171e2f272@default(draft) add gg |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1397 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1398 o 16:0cf3707e8971@default(draft) a3 |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1399 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1400 ~ |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1401 |
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1402 Check that fold respects the allowunstable option |
2767
ab80ef8d0cfa
test: extract most fold testing into a test-fold module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
1403 |
ab80ef8d0cfa
test: extract most fold testing into a test-fold module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
1404 (most of this has been moved to test-fold.t) |
ab80ef8d0cfa
test: extract most fold testing into a test-fold module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2587
diff
changeset
|
1405 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1406 $ hg up 0cf3707e8971 |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1407 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1408 $ mkcommit unstableifparentisfolded |
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1409 created new head |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1410 $ glog -r "0cf3707e8971::" |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1411 @ 27:2d1b55e10be9@default(draft) add unstableifparentisfolded |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1412 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1413 | o 26:4c6f6f6d1976@default(draft) add c5_ |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1414 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1415 +---o 18:0c049e4e5422@default(draft) add gh |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1416 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1417 | o 17:98e171e2f272@default(draft) add gg |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1418 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1419 o 16:0cf3707e8971@default(draft) a3 |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1420 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1421 ~ |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1422 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1423 $ hg fold --exact "98e171e2f272::" |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1424 2 changesets folded |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1425 |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1426 Check that evolve shows error while handling split commits |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1427 -------------------------------------- |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1428 |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1429 $ cat >> $HGRCPATH <<EOF |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1430 > [experimental] |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1431 > evolution=all |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1432 > EOF |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1433 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1434 $ glog -r "0cf3707e8971::" |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1435 o 28:92ca6f3984de@default(draft) add gg |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1436 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1437 | @ 27:2d1b55e10be9@default(draft) add unstableifparentisfolded |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1438 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1439 | o 18:0c049e4e5422@default(draft) add gh |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1440 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1441 o 16:0cf3707e8971@default(draft) a3 |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1442 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1443 ~ |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1444 |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1445 Create a split commit |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1446 $ printf "oo" > oo; |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1447 $ printf "pp" > pp; |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1448 $ hg add oo pp |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1449 $ hg commit -m "oo+pp" |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1450 $ mkcommit uu |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1451 $ hg up 2d1b55e10be9 |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1452 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1453 $ printf "oo" > oo; |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1454 $ hg add oo |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1455 $ hg commit -m "_oo" |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1456 created new head |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1457 $ printf "pp" > pp; |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1458 $ hg add pp |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1459 $ hg commit -m "_pp" |
1471
4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`
Laurent Charignon <lcharignon@fb.com>
parents:
1453
diff
changeset
|
1460 $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1461 1 changesets pruned |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1462 1 new orphan changesets |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1463 $ glog -r "0cf3707e8971::" |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1464 @ 32:c7dbf668e9d5@default(draft) _pp |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1465 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1466 o 31:2b5a32114b3d@default(draft) _oo |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1467 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
1468 | * 30:4d122571f3b6@default(draft) add uu |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1469 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1470 | x 29:7da3e73df8a5@default(draft) oo+pp |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1471 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1472 | o 28:92ca6f3984de@default(draft) add gg |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1473 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1474 o | 27:2d1b55e10be9@default(draft) add unstableifparentisfolded |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1475 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1476 | o 18:0c049e4e5422@default(draft) add gh |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1477 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1478 o 16:0cf3707e8971@default(draft) a3 |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1479 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1480 ~ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1481 $ hg evolve --rev "0cf3707e8971::" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1482 move:[30] add uu |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1483 atop:[32] _pp |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1484 working directory is now at be23044af550 |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1485 |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1486 |
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1487 Check that dirstate changes are kept at failure for conflicts (issue4966) |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1488 ---------------------------------------- |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1489 |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1490 $ echo "will be amended" > newfile |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1491 $ hg commit -m "will be amended" |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1492 $ hg parents |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1493 34 : will be amended - test |
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1494 |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1495 $ echo "will be evolved safely" >> a |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1496 $ hg commit -m "will be evolved safely" |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1497 |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1498 $ echo "will cause conflict at evolve" > newfile |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1499 $ echo "newly added" > newlyadded |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1500 $ hg add newlyadded |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1501 $ hg commit -m "will cause conflict at evolve" |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1502 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1503 $ glog -r "0cf3707e8971::" |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1504 @ 36:59c37c5bebd1@default(draft) will cause conflict at evolve |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1505 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1506 o 35:7cc12c6c7862@default(draft) will be evolved safely |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1507 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1508 o 34:98c7ab460e6b@default(draft) will be amended |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1509 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1510 o 33:be23044af550@default(draft) add uu |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1511 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1512 o 32:c7dbf668e9d5@default(draft) _pp |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1513 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1514 o 31:2b5a32114b3d@default(draft) _oo |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1515 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1516 | o 28:92ca6f3984de@default(draft) add gg |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1517 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1518 o | 27:2d1b55e10be9@default(draft) add unstableifparentisfolded |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1519 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1520 | o 18:0c049e4e5422@default(draft) add gh |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1521 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1522 o 16:0cf3707e8971@default(draft) a3 |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1523 | |
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1524 ~ |
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1525 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1526 $ hg update -q 98c7ab460e6b |
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1527 $ echo "amended" > newfile |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1528 $ hg amend -m "amended" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1529 2 new orphan changesets |
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1530 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1531 $ hg evolve --rev "98c7ab460e6b::" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1532 move:[35] will be evolved safely |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1533 atop:[37] amended |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1534 move:[36] will cause conflict at evolve |
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1535 atop:[38] will be evolved safely |
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1536 merging newfile |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1537 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1538 evolve failed! |
3702
f6979d64b9fb
evolve: point to '--abort' in error message
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3599
diff
changeset
|
1539 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1540 abort: unresolved merge conflicts (see hg help resolve) |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1541 [255] |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1542 |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1543 $ glog -r "be23044af550::" --hidden |
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1544 @ 38:61abd81de026@default(draft) will be evolved safely |
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1545 | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1546 o 37:df89d30f23e2@default(draft) amended |
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1547 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
1548 | * 36:59c37c5bebd1@default(draft) will cause conflict at evolve |
2929
06844693bb21
tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents:
2858
diff
changeset
|
1549 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1550 | x 35:7cc12c6c7862@default(draft) will be evolved safely |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1551 | | |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1552 | x 34:98c7ab460e6b@default(draft) will be amended |
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1553 |/ |
3374
612b3bd31499
evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
1554 o 33:be23044af550@default(draft) add uu |
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1555 | |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1556 ~ |
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1557 |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1558 $ hg status newlyadded |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1559 A newlyadded |