author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Sun, 02 Jul 2017 19:35:38 +0200 | |
branch | stable |
changeset 2706 | 734c0bc066cd |
parent 2587 | cbc7a69116bd |
child 2595 | 54ac473663ff |
child 2767 | ab80ef8d0cfa |
permissions | -rw-r--r-- |
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] |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
17 |
> hgext.graphlog= |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
18 |
> EOF |
1806
9f42f819267b
evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1785
diff
changeset
|
19 |
$ 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
|
20 |
$ mkcommit() { |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 |
> echo "$1" > "$1" |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 |
> hg add "$1" |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 |
> hg ci -m "add $1" |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
24 |
> } |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
25 |
|
1358
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
26 |
$ mkstack() { |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
27 |
> # 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
|
28 |
> hg update $1 -C |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
29 |
> shift |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
30 |
> mkcommits $* |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
31 |
> } |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
32 |
|
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
33 |
$ glog() { |
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
34 |
> hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" |
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
35 |
> } |
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
36 |
|
1358
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
37 |
$ shaof() { |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
38 |
> 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
|
39 |
> } |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
40 |
|
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
41 |
$ mkcommits() { |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
42 |
> 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
|
43 |
> } |
3f5db977d46f
evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1357
diff
changeset
|
44 |
|
1414
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
45 |
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
|
46 |
|
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
47 |
$ hg help evolution |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
48 |
Safely Rewriting History |
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 |
|
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
51 |
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
|
52 |
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
|
53 |
|
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
54 |
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
|
55 |
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
|
56 |
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
|
57 |
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
|
58 |
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
|
59 |
'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
|
60 |
|
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
61 |
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
|
62 |
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
|
63 |
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
|
64 |
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
|
65 |
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
|
66 |
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
|
67 |
data. |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
68 |
|
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
69 |
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
|
70 |
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
|
71 |
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
|
72 |
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
|
73 |
part of history concurrently. |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
74 |
|
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
75 |
Current feature status |
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 |
|
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
78 |
This feature is still in development. If you see this help, you have |
1710 | 79 |
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
|
80 |
|
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
81 |
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
|
82 |
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
|
83 |
only be done via an extension). |
4198e2fad6ba
evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1410
diff
changeset
|
84 |
|
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
85 |
various init |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
86 |
|
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
87 |
$ hg init local |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
88 |
$ cd local |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
89 |
$ mkcommit a |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
90 |
$ mkcommit b |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
91 |
$ cat >> .hg/hgrc << EOF |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
92 |
> [phases] |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
93 |
> publish = True |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
94 |
> EOF |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
95 |
$ 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
|
96 |
$ rm .hg/hgrc |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
97 |
$ mkcommit c |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
98 |
$ mkcommit d |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
99 |
$ hg up 1 |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
100 |
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
|
101 |
$ mkcommit e -q |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
102 |
created new head |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
103 |
$ mkcommit f |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
104 |
$ hg qlog |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
105 |
5 - e44648563c73 add f (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
106 |
4 - fbb94e3a0ecf add e (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
107 |
3 - 47d2a3944de8 add d (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
108 |
2 - 4538525df7e2 add c (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
109 |
1 - 7c3bad9141dc add b (public) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
110 |
0 - 1f0dee641bb7 add a (public) |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
111 |
|
414
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
112 |
test kill and immutable changeset |
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
113 |
|
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
114 |
$ 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
|
115 |
1 public |
1631
7463f5880ce9
prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1594
diff
changeset
|
116 |
$ hg prune 1 |
687
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
652
diff
changeset
|
117 |
abort: cannot prune immutable changeset: 7c3bad9141dc |
1756
a7dcfff8c4a9
evolve: use single quotes in usage messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
1753
diff
changeset
|
118 |
(see 'hg help phases' for details) |
444
aedb6b8ace86
drop repo.addobsolete
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
443
diff
changeset
|
119 |
[255] |
414
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
120 |
$ 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
|
121 |
1 public |
414
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
122 |
|
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
123 |
test simple kill |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
124 |
|
317
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
125 |
$ hg id -n |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
126 |
5 |
1631
7463f5880ce9
prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1594
diff
changeset
|
127 |
$ hg prune . |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
128 |
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
|
129 |
working directory now at fbb94e3a0ecf |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1197
diff
changeset
|
130 |
1 changesets pruned |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
131 |
$ hg qlog |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
132 |
4 - fbb94e3a0ecf add e (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
133 |
3 - 47d2a3944de8 add d (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
134 |
2 - 4538525df7e2 add c (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
135 |
1 - 7c3bad9141dc add b (public) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
136 |
0 - 1f0dee641bb7 add a (public) |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
137 |
|
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
138 |
test multiple kill |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
139 |
|
1631
7463f5880ce9
prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1594
diff
changeset
|
140 |
$ hg prune 4 -r 3 |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
141 |
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
|
142 |
working directory now at 7c3bad9141dc |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1197
diff
changeset
|
143 |
2 changesets pruned |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
144 |
$ hg qlog |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
145 |
2 - 4538525df7e2 add c (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
146 |
1 - 7c3bad9141dc add b (public) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
147 |
0 - 1f0dee641bb7 add a (public) |
317
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
148 |
|
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
149 |
test kill with dirty changes |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
150 |
|
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
151 |
$ hg up 2 |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
152 |
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
|
153 |
$ echo 4 > g |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
154 |
$ hg add g |
1631
7463f5880ce9
prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1594
diff
changeset
|
155 |
$ hg prune . |
317
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
156 |
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
|
157 |
working directory now at 7c3bad9141dc |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1197
diff
changeset
|
158 |
1 changesets pruned |
317
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
159 |
$ hg st |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
160 |
A g |
1279
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
161 |
|
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
162 |
Smoketest debugobsrelsethashtree: |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
163 |
|
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
164 |
$ hg debugobsrelsethashtree |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
165 |
1f0dee641bb7258c56bd60e93edfa2405381c41e 0000000000000000000000000000000000000000 |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
166 |
7c3bad9141dcb46ff89abf5f61856facd56e476c * (glob) |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
167 |
4538525df7e2b9f09423636c61ef63a4cb872a2d * (glob) |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
168 |
47d2a3944de8b013de3be9578e8e344ea2e6c097 * (glob) |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
169 |
fbb94e3a0ecf6d20c2cc31152ef162ce45af982f * (glob) |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
170 |
e44648563c73f75950076031c6fdf06629de95f1 * (glob) |
064cf9ee4460
debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1197
diff
changeset
|
171 |
|
2083
778afb036245
discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1806
diff
changeset
|
172 |
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
|
173 |
|
2230
a202f3af890c
debugobshashrange: add a --subranges option
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2229
diff
changeset
|
174 |
$ hg debugobshashrange --subranges --rev 'head()' |
2228
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
175 |
rev node index size depth obshash |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
176 |
1 7c3bad9141dc 0 2 2 * (glob) |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
177 |
0 1f0dee641bb7 0 1 1 000000000000 |
3b18440cca74
debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
178 |
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
|
179 |
|
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
180 |
$ cd .. |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
181 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
182 |
########################## |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
183 |
importing Parren test |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
184 |
########################## |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
185 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
186 |
$ cat << EOF >> $HGRCPATH |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
187 |
> [ui] |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
188 |
> 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
|
189 |
> EOF |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
190 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
191 |
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
|
192 |
=============================== |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
193 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
194 |
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
|
195 |
------------------- |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
196 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
197 |
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
|
198 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
199 |
$ 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
|
200 |
$ 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
|
201 |
> One |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
202 |
> |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
203 |
> Two |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
204 |
> |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
205 |
> Three |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
206 |
> EOF |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
207 |
$ 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
|
208 |
$ hg add |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
209 |
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
|
210 |
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
|
211 |
$ 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
|
212 |
$ cd .. |
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 |
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
|
215 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
216 |
$ 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
|
217 |
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
|
218 |
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
|
219 |
$ cd work |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
220 |
|
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 |
Create First Patch |
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 |
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
|
226 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
227 |
$ 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
|
228 |
$ 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
|
229 |
$ 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
|
230 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
231 |
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
|
232 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
233 |
$ hg diff |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
234 |
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
|
235 |
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
|
236 |
--- /dev/null |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
237 |
+++ 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
|
238 |
@@ -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
|
239 |
+One |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
240 |
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
|
241 |
--- 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
|
242 |
+++ 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
|
243 |
@@ -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
|
244 |
-One |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
245 |
+Eins |
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 |
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
|
248 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
249 |
$ 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
|
250 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
251 |
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
|
252 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
253 |
$ 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
|
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 |
Create Second Patch |
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 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
259 |
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
|
260 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
261 |
$ 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
|
262 |
$ 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
|
263 |
$ 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
|
264 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
265 |
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
|
266 |
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
|
267 |
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
|
268 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
269 |
$ 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
|
270 |
$ 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
|
271 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
272 |
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
|
273 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
274 |
$ hg book |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
275 |
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
|
276 |
* 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
|
277 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
278 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
279 |
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
|
280 |
-------------------- |
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 |
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
|
283 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
284 |
$ 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
|
285 |
+Zwie |
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 |
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
|
288 |
|
88
64fe5a4f877e
[evolution] first workign draft of a relocate function
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
87
diff
changeset
|
289 |
$ 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
|
290 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
291 |
and **amend**:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
292 |
|
741
892a6d708c8f
amend: drop the deprecated note option
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
718
diff
changeset
|
293 |
$ hg amend |
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
294 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
295 |
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
|
296 |
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
|
297 |
|
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
298 |
$ hg log |
1105
836c4128c027
test: add parent hash to commit message in test-evolve.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
1104
diff
changeset
|
299 |
4 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
|
300 |
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
|
301 |
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
|
302 |
|
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
303 |
$ hg up feature-A -q |
139
9b9500175ae5
evolve that does something \o/
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
138
diff
changeset
|
304 |
$ 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
|
305 |
$ 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
|
306 |
|
475
9f69a5e41ab0
[evolve] amend: check phase before starting the transition
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
474
diff
changeset
|
307 |
(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
|
308 |
|
474
5c031e1c90e2
test: turn the base public
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
418
diff
changeset
|
309 |
$ hg phase --public 0 -v |
5c031e1c90e2
test: turn the base public
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
418
diff
changeset
|
310 |
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
|
311 |
|
9f69a5e41ab0
[evolve] amend: check phase before starting the transition
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
474
diff
changeset
|
312 |
|
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
|
313 |
(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
|
314 |
|
741
892a6d708c8f
amend: drop the deprecated note option
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
718
diff
changeset
|
315 |
$ hg amend |
486 | 316 |
1 new unstable changesets |
87
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
317 |
$ hg log |
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
318 |
6 feature-A: a nifty feature - test |
1105
836c4128c027
test: add parent hash to commit message in test-evolve.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
1104
diff
changeset
|
319 |
4 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
|
320 |
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
|
321 |
0 : base - test |
302
d68ccae92d52
obsolete: make collapse create less markers
Patrick Mezard <patrick@mezard.eu>
parents:
296
diff
changeset
|
322 |
$ hg up -q 0 |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
323 |
$ glog --hidden |
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
741
diff
changeset
|
324 |
o 6: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
|
325 |
| |
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
741
diff
changeset
|
326 |
| x 5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
327 |
| | |
1104
cb36a4eb0157
evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1099
diff
changeset
|
328 |
| | o 4: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
|
329 |
| |/ |
1104
cb36a4eb0157
evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1099
diff
changeset
|
330 |
| | x 3:c97947cdc7a2@default(draft) temporary amend commit for 73296a82292a |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
331 |
| | | |
1104
cb36a4eb0157
evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1099
diff
changeset
|
332 |
| | 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
|
333 |
| |/ |
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
334 |
| 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
|
335 |
|/ |
474
5c031e1c90e2
test: turn the base public
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
418
diff
changeset
|
336 |
@ 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
|
337 |
|
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
338 |
$ hg debugobsolete |
2572
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
339 |
73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
340 |
c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'ef1': '0', 'user': 'test'} (glob) |
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
341 |
568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
342 |
c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'ef1': '0', 'user': 'test'} (glob) |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
343 |
$ hg evolve |
1104
cb36a4eb0157
evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1099
diff
changeset
|
344 |
move:[4] another feature (child of 568a468b60fc) |
139
9b9500175ae5
evolve that does something \o/
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
138
diff
changeset
|
345 |
atop:[6] 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
|
346 |
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
|
347 |
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
|
348 |
$ hg log |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
349 |
7 feature-B: another feature (child of ba0ec09b1bab) - test |
87
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
350 |
6 feature-A: 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
|
351 |
0 : base - test |
116
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
352 |
|
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
353 |
Test commit -o options |
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
354 |
|
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
355 |
$ hg up 6 |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
356 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
116
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
357 |
$ hg revert -r 7 --all |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
358 |
adding file-from-B |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
359 |
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
|
360 |
$ sed -i'' -e s/Zwei/deux/ main-file-1 |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
361 |
$ hg commit -m 'another feature that rox' -o 7 |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
362 |
created new head |
116
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
363 |
$ hg log |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
364 |
8 feature-B: another feature that rox - test |
116
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
365 |
6 feature-A: a nifty feature - test |
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
366 |
0 : base - test |
309
de21685d22d1
evolve: warn when latecomer changeset are created
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
302
diff
changeset
|
367 |
|
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
368 |
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
|
369 |
|
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
370 |
$ hg phase --hidden --public 7 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
371 |
1 new bumped changesets |
309
de21685d22d1
evolve: warn when latecomer changeset are created
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
302
diff
changeset
|
372 |
|
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
373 |
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
|
374 |
|
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
375 |
$ hg glog |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
376 |
@ 8 feature-B: another feature that rox - test |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
377 |
| |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
378 |
| o 7 : another feature (child of ba0ec09b1bab) - test |
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
|
379 |
|/ |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
380 |
o 6 feature-A: a nifty feature - test |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
381 |
| |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
382 |
o 0 : base - test |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
383 |
|
1404
848a04c078c7
evolve: add selector for trouble types
Laurent Charignon <lcharignon@fb.com>
parents:
1398
diff
changeset
|
384 |
$ hg evolve --any --traceback --bumped |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
385 |
recreate:[8] another feature that rox |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
386 |
atop:[7] another feature (child of ba0ec09b1bab) |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
387 |
computing new diff |
1735
8f902ec9ed9a
bump: copy parent manifest before editting it
Durham Goode <durham@fb.com>
parents:
1710
diff
changeset
|
388 |
committed as 6707c5e1c49d |
8f902ec9ed9a
bump: copy parent manifest before editting it
Durham Goode <durham@fb.com>
parents:
1710
diff
changeset
|
389 |
working directory is now at 6707c5e1c49d |
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
|
390 |
$ hg glog |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
391 |
@ 9 feature-B: bumped update to 99833d22b0c6: - test |
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
|
392 |
| |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
393 |
o 7 : another feature (child of ba0ec09b1bab) - test |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
394 |
| |
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
|
395 |
o 6 feature-A: a nifty feature - test |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
396 |
| |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
397 |
o 0 : base - test |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
398 |
|
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
399 |
$ hg diff --hidden -r 9 -r 8 |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
400 |
$ hg diff -r 9^ -r 9 |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
401 |
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
|
402 |
--- a/main-file-1 |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
403 |
+++ b/main-file-1 |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
404 |
@@ -3,1 +3,1 @@ |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
405 |
-Zwei |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
406 |
+deux |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
407 |
$ hg log -r 'bumped()' # 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
|
408 |
|
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
409 |
test evolve --all |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
410 |
$ 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
|
411 |
$ hg commit -m 'dansk 2!' |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
412 |
$ 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
|
413 |
$ hg commit -m 'dansk 3!' |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
414 |
$ hg update 9 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
415 |
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
|
416 |
$ 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
|
417 |
$ hg commit --amend -m 'dansk!' |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
418 |
2 new unstable changesets |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
419 |
|
1399
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
420 |
(ninja test for the {trouble} template: |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
421 |
|
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
422 |
$ hg log -G --template '{rev} {troubles}\n' |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
423 |
@ 13 |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
424 |
| |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
425 |
| o 11 unstable |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
426 |
| | |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
427 |
| o 10 unstable |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
428 |
| | |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
429 |
| x 9 |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
430 |
|/ |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
431 |
o 7 |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
432 |
| |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
433 |
o 6 |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
434 |
| |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
435 |
o 0 |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
436 |
|
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
437 |
|
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
438 |
|
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
439 |
(/ninja) |
9ff6d9240f16
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
945
diff
changeset
|
440 |
|
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
441 |
$ hg evolve --all --traceback |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
442 |
move:[10] dansk 2! |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
443 |
atop:[13] dansk! |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
444 |
merging main-file-1 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
445 |
move:[11] dansk 3! |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
446 |
atop:[14] dansk 2! |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
447 |
merging main-file-1 |
1735
8f902ec9ed9a
bump: copy parent manifest before editting it
Durham Goode <durham@fb.com>
parents:
1710
diff
changeset
|
448 |
working directory is now at 68557e4f0048 |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
449 |
$ hg glog |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
450 |
@ 15 : dansk 3! - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
451 |
| |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
452 |
o 14 : dansk 2! - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
453 |
| |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
454 |
o 13 feature-B: dansk! - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
455 |
| |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
456 |
o 7 : another feature (child of ba0ec09b1bab) - test |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
457 |
| |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
458 |
o 6 feature-A: a nifty feature - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
459 |
| |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
460 |
o 0 : base - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
461 |
|
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
462 |
|
196
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
463 |
$ cd .. |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
464 |
|
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
465 |
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
|
466 |
|
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
467 |
$ 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
|
468 |
> [format] |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
469 |
> generaldelta=1 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
470 |
> EOF |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
471 |
|
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
472 |
|
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
473 |
|
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
474 |
$ 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
|
475 |
$ cd alpha |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
476 |
$ 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
|
477 |
$ 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
|
478 |
$ 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
|
479 |
|
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
480 |
$ cd .. |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
481 |
$ 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
|
482 |
adding changesets |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
483 |
adding manifests |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
484 |
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
|
485 |
added 1 changesets with 1 changes to 1 files |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
486 |
$ cd alpha |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
487 |
|
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
488 |
$ 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
|
489 |
> We |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
490 |
> need |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
491 |
> some |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
492 |
> kind |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
493 |
> of |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
494 |
> file |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
495 |
> big |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
496 |
> enough |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
497 |
> to |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
498 |
> prevent |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
499 |
> snapshot |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
500 |
> . |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
501 |
> yes |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
502 |
> new |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
503 |
> lines |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
504 |
> are |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
505 |
> useless |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
506 |
> . |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
507 |
> EOF |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
508 |
$ 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
|
509 |
$ 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
|
510 |
$ 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
|
511 |
$ echo '.' >> B |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
512 |
$ 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
|
513 |
$ hg verify |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
514 |
checking changesets |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
515 |
checking manifests |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
516 |
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
|
517 |
checking files |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
518 |
3 files, 4 changesets, 4 total revisions |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
519 |
$ 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
|
520 |
abort: empty revision set |
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
521 |
[255] |
2564
cda34aeb01d7
test-evolve: garbage collection changeset only, not obsmarkers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2547
diff
changeset
|
522 |
(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
|
523 |
$ hg --config extensions.hgext.mq= strip --hidden 'extinct()' --config devel.strip-obsmarkers=no |
1195
af9fd422adbb
tests: update to new core output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1188
diff
changeset
|
524 |
saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-d7bd82e9-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
|
525 |
$ hg verify |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
526 |
checking changesets |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
527 |
checking manifests |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
528 |
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
|
529 |
checking files |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
530 |
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
|
531 |
$ cd .. |
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 |
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
|
534 |
|
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
535 |
$ cd beta |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
536 |
$ 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
|
537 |
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
|
538 |
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
|
539 |
adding changesets |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
540 |
adding manifests |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
541 |
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
|
542 |
added 1 changesets with 1 changes to 1 files |
1453
8ca31deb8db7
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1450
diff
changeset
|
543 |
2 new obsolescence markers |
196
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
544 |
(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
|
545 |
$ hg up |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
546 |
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
|
547 |
|
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
548 |
$ cd .. |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
549 |
|
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
550 |
Test graft --obsolete/--old-obsolete |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
551 |
|
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
552 |
$ hg init test-graft |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
553 |
$ cd test-graft |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
554 |
$ mkcommit 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
555 |
$ mkcommit 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
556 |
$ mkcommit 2 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
557 |
$ mkcommit 3 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
558 |
$ hg up -qC 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
559 |
$ mkcommit 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
560 |
created new head |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
561 |
$ glog --hidden |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
562 |
@ 4:ce341209337f@default(draft) add 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
563 |
| |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
564 |
| o 3:0e84df4912da@default(draft) add 3 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
565 |
| | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
566 |
| o 2:db038628b9e5@default(draft) add 2 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
567 |
| | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
568 |
| o 1:73d38bb17fd7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
569 |
|/ |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
570 |
o 0:8685c6d34325@default(draft) add 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
571 |
|
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
572 |
$ hg graft -r3 -O |
1188
0c879e986ce4
test: adapt to core change in graft and rebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
573 |
grafting 3:0e84df4912da "add 3" |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
574 |
$ hg graft -r1 -o 2 |
1188
0c879e986ce4
test: adapt to core change in graft and rebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
575 |
grafting 1:73d38bb17fd7 "add 1" |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
576 |
$ glog --hidden |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
577 |
@ 6:acb28cd497b7@default(draft) add 1 |
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 |
o 5:0b9e50c35132@default(draft) add 3 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
580 |
| |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
581 |
o 4:ce341209337f@default(draft) add 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
582 |
| |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
583 |
| x 3:0e84df4912da@default(draft) add 3 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
584 |
| | |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
585 |
| x 2:db038628b9e5@default(draft) add 2 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
586 |
| | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
587 |
| o 1:73d38bb17fd7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
588 |
|/ |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
589 |
o 0:8685c6d34325@default(draft) add 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
590 |
|
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
591 |
$ hg debugobsolete |
2572
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
592 |
0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
593 |
db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'ef1': '13', 'user': 'test'} (glob) |
418
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 |
Test graft --continue |
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 |
$ hg up -qC 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
598 |
$ echo 2 > 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
599 |
$ hg ci -Am conflict 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
600 |
created new head |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
601 |
$ hg up -qC 6 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
602 |
$ hg graft -O 7 |
1188
0c879e986ce4
test: adapt to core change in graft and rebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
603 |
grafting 7:a5bfd90a2f29 "conflict" (tip) |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
604 |
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
|
605 |
warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
606 |
abort: unresolved conflicts, can't continue |
1673
8e879d59b20e
tests: change quoting pattern to match core's conventions
Laurent Charignon <lcharignon@fb.com>
parents:
1641
diff
changeset
|
607 |
(use 'hg resolve' and 'hg graft --continue') |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
608 |
[255] |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
609 |
$ 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
|
610 |
7:a5bfd90a2f29 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
611 |
$ echo 3 > 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
612 |
$ 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
|
613 |
(no more unresolved files) |
1587
ea7523380efa
test: update with new graft output
Durham Goode <durham@fb.com>
parents:
1584
diff
changeset
|
614 |
continue: hg graft --continue |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
615 |
$ hg graft --continue -O |
1188
0c879e986ce4
test: adapt to core change in graft and rebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
616 |
grafting 7:a5bfd90a2f29 "conflict" (tip) |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
617 |
$ glog --hidden |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
618 |
@ 8:920e58bb443b@default(draft) conflict |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
619 |
| |
420 | 620 |
| x 7:a5bfd90a2f29@default(draft) conflict |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
621 |
| | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
622 |
o | 6:acb28cd497b7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
623 |
| | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
624 |
o | 5:0b9e50c35132@default(draft) add 3 |
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 |
o | 4:ce341209337f@default(draft) add 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
627 |
|/ |
420 | 628 |
| x 3:0e84df4912da@default(draft) add 3 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
629 |
| | |
420 | 630 |
| x 2:db038628b9e5@default(draft) add 2 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
631 |
| | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
632 |
| o 1:73d38bb17fd7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
633 |
|/ |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
634 |
o 0:8685c6d34325@default(draft) add 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
635 |
|
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
636 |
$ hg debugobsolete |
2572
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
637 |
0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
638 |
db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'ef1': '13', 'user': 'test'} (glob) |
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
639 |
a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (*) {'ef1': '12', 'user': 'test'} (glob) |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
640 |
|
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
641 |
Test touch |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
642 |
|
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
643 |
$ glog |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
644 |
@ 8:920e58bb443b@default(draft) conflict |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
645 |
| |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
646 |
o 6:acb28cd497b7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
647 |
| |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
648 |
o 5:0b9e50c35132@default(draft) add 3 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
649 |
| |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
650 |
o 4:ce341209337f@default(draft) add 4 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
651 |
| |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
652 |
| o 1:73d38bb17fd7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
653 |
|/ |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
654 |
o 0:8685c6d34325@default(draft) add 0 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
655 |
|
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
656 |
$ hg touch |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
657 |
$ glog |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
658 |
@ 9:*@default(draft) conflict (glob) |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
659 |
| |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
660 |
o 6:acb28cd497b7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
661 |
| |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
662 |
o 5:0b9e50c35132@default(draft) add 3 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
663 |
| |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
664 |
o 4:ce341209337f@default(draft) add 4 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
665 |
| |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
666 |
| o 1:73d38bb17fd7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
667 |
|/ |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
668 |
o 0:8685c6d34325@default(draft) add 0 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
669 |
|
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
670 |
$ hg touch . |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
671 |
$ glog |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
672 |
@ 10:*@default(draft) conflict (glob) |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
673 |
| |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
674 |
o 6:acb28cd497b7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
675 |
| |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
676 |
o 5:0b9e50c35132@default(draft) add 3 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
677 |
| |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
678 |
o 4:ce341209337f@default(draft) add 4 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
679 |
| |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
680 |
| o 1:73d38bb17fd7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
681 |
|/ |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
682 |
o 0:8685c6d34325@default(draft) add 0 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
683 |
|
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
684 |
|
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
685 |
Test fold |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
686 |
|
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
687 |
$ rm *.orig |
561
897f6da2314e
fold: handle the lack of revision to fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
553
diff
changeset
|
688 |
$ hg fold |
994
debf44fa91a2
fold: clarify message for empty revision set and abort instead (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
982
diff
changeset
|
689 |
abort: no revisions specified |
debf44fa91a2
fold: clarify message for empty revision set and abort instead (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
982
diff
changeset
|
690 |
[255] |
1782
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
691 |
$ hg fold --from |
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
692 |
abort: no revisions specified |
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
693 |
[255] |
995
0f3a7efd6ee9
fold: emit error message when folding a single revision
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
994
diff
changeset
|
694 |
$ hg fold . |
1782
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
695 |
abort: must specify either --from or --exact |
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
696 |
[255] |
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
697 |
$ hg fold --from . --exact |
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
698 |
abort: cannot use both --from and --exact |
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
699 |
[255] |
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
700 |
$ hg fold --from . |
995
0f3a7efd6ee9
fold: emit error message when folding a single revision
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
994
diff
changeset
|
701 |
single revision specified, nothing to fold |
561
897f6da2314e
fold: handle the lack of revision to fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
553
diff
changeset
|
702 |
[1] |
998
85ec2a55fe7c
fold: improve error messages for multiple heads and roots
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
997
diff
changeset
|
703 |
$ hg fold 0::10 --rev 1 --exact |
85ec2a55fe7c
fold: improve error messages for multiple heads and roots
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
997
diff
changeset
|
704 |
abort: cannot fold non-linear revisions (multiple heads given) |
85ec2a55fe7c
fold: improve error messages for multiple heads and roots
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
997
diff
changeset
|
705 |
[255] |
85ec2a55fe7c
fold: improve error messages for multiple heads and roots
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
997
diff
changeset
|
706 |
$ hg fold -r 4 -r 6 --exact |
85ec2a55fe7c
fold: improve error messages for multiple heads and roots
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
997
diff
changeset
|
707 |
abort: cannot fold non-linear revisions (multiple roots given) |
702
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
699
diff
changeset
|
708 |
[255] |
1782
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
709 |
$ hg fold --from 10 1 |
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
710 |
abort: cannot fold non-linear revisions |
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
711 |
(given revisions are unrelated to parent of working directory) |
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
712 |
[255] |
1784
c3741a5adbb0
fold: cleanly abort on empty fold set (issue5453)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1756
diff
changeset
|
713 |
$ hg fold --exact -r "4 and not 4" |
c3741a5adbb0
fold: cleanly abort on empty fold set (issue5453)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1756
diff
changeset
|
714 |
abort: specified revisions evaluate to an empty set |
c3741a5adbb0
fold: cleanly abort on empty fold set (issue5453)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1756
diff
changeset
|
715 |
(use different revision arguments) |
c3741a5adbb0
fold: cleanly abort on empty fold set (issue5453)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1756
diff
changeset
|
716 |
[255] |
997
f48cd2f48d14
fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
996
diff
changeset
|
717 |
$ 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
|
718 |
$ hg fold --from -r 0 |
997
f48cd2f48d14
fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
996
diff
changeset
|
719 |
abort: cannot fold public revisions |
f48cd2f48d14
fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
996
diff
changeset
|
720 |
[255] |
1782
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
721 |
$ 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
|
722 |
3 changesets folded |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
723 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1782
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
724 |
$ hg fold --from 6 # want to run hg fold 6 |
1133
8b3b0549a4b6
test: adapt to new hidden-changeset message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1128
diff
changeset
|
725 |
abort: hidden revision '6'! |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2230
diff
changeset
|
726 |
(use --hidden to access hidden revisions; successor: af636757ce3b) |
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
727 |
[255] |
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
728 |
$ 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
|
729 |
add 3 |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
730 |
|
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
731 |
|
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
732 |
add 1 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
733 |
|
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
734 |
|
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
735 |
conflict |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
736 |
$ hg debugrebuildstate |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
737 |
$ hg st |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
738 |
|
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
739 |
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
|
740 |
|
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
741 |
$ hg up 4 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
742 |
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
|
743 |
$ 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
|
744 |
2 changesets folded |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
745 |
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
|
746 |
$ glog |
915
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
747 |
@ 12:d26d339c513f@default(draft) add 4 |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
748 |
| |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
749 |
| o 1:73d38bb17fd7@default(draft) add 1 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
750 |
|/ |
997
f48cd2f48d14
fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
996
diff
changeset
|
751 |
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
|
752 |
|
915
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
753 |
$ hg log --template '{rev}: {author}\n' |
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
754 |
12: victor |
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
755 |
1: test |
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
756 |
0: test |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
757 |
$ hg log -r 12 --template '{desc}\n' |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
758 |
add 4 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
759 |
|
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
760 |
|
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
761 |
add 3 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
762 |
|
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
763 |
|
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
764 |
add 1 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
765 |
|
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
766 |
|
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
767 |
conflict |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
768 |
$ hg debugrebuildstate |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
769 |
$ hg st |
483
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
770 |
|
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
771 |
Test olog |
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
772 |
|
2426
0751c8f6005d
test: reduce output size to fight unstability
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2416
diff
changeset
|
773 |
$ 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
|
774 |
@ d26d339c513f (12) add 4 |
23c0bef0b5d4
obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
775 |
|\ |
23c0bef0b5d4
obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
776 |
x | af636757ce3b (11) add 3 |
2572
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
777 |
|\ \ rewritten(description, user, parent, content) by test (*) as d26d339c513f (glob) |
2416
23c0bef0b5d4
obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
778 |
| | | |
23c0bef0b5d4
obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
779 |
| \ \ |
23c0bef0b5d4
obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
780 |
| |\ \ |
23c0bef0b5d4
obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
781 |
| | | x ce341209337f (4) add 4 |
2572
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
782 |
| | | rewritten(description, user, content) by test (*) as d26d339c513f (glob) |
2416
23c0bef0b5d4
obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2290
diff
changeset
|
783 |
| | | |
901
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
784 |
|
807
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
785 |
Test obsstore stat |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
786 |
|
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
787 |
$ hg debugobsstorestat |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
788 |
markers total: 10 |
2547
3c594000844b
debugobsstorestat: adds static about actually obsolete changeses
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2501
diff
changeset
|
789 |
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
|
790 |
with parents data: 0 |
807
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
791 |
markers with no successors: 0 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
792 |
1 successors: 10 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
793 |
2 successors: 0 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
794 |
more than 2 successors: 0 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
795 |
available keys: |
2572
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
796 |
ef1: 10 |
807
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
797 |
user: 10 |
2440
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
798 |
marker size: |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
799 |
format v1: |
2572
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
800 |
smallest length: 75 |
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
801 |
longer length: 76 |
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
802 |
median length: 76 |
aa2ce20e6247
effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2564
diff
changeset
|
803 |
mean length: 75 |
2440
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
804 |
format v0: |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
805 |
smallest length: * (glob) |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
806 |
longer length: * (glob) |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
807 |
median length: * (glob) |
0fa7971071b1
debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2426
diff
changeset
|
808 |
mean length: * (glob) |
809
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
809 |
disconnected clusters: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
810 |
any known node: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
811 |
smallest length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
812 |
longer length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
813 |
median length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
814 |
mean length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
815 |
using parents data: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
816 |
any known node: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
817 |
smallest length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
818 |
longer length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
819 |
median length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
820 |
mean length: 10 |
907 | 821 |
|
901
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
822 |
|
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
823 |
Test evolving renames |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
824 |
|
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
825 |
$ hg up null |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
826 |
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
|
827 |
$ echo a > a |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
828 |
$ hg ci -Am a |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
829 |
adding a |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
830 |
created new head |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
831 |
$ echo b > b |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
832 |
$ hg ci -Am b |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
833 |
adding b |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
834 |
$ hg mv a c |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
835 |
$ hg ci -m c |
1631
7463f5880ce9
prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1594
diff
changeset
|
836 |
$ hg prune .^ |
901
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
837 |
1 changesets pruned |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
838 |
1 new unstable changesets |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
839 |
$ hg stab --any |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
840 |
move:[15] c |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
841 |
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
|
842 |
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
|
843 |
$ hg st -C --change=tip |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
844 |
A c |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
845 |
a |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
846 |
R a |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
847 |
|
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
848 |
Test fold with commit messages |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
849 |
|
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
850 |
$ cd ../work |
1782
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
851 |
$ 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
|
852 |
2 changesets folded |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
853 |
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
|
854 |
$ glog |
1735
8f902ec9ed9a
bump: copy parent manifest before editting it
Durham Goode <durham@fb.com>
parents:
1710
diff
changeset
|
855 |
@ 16:98cb758db56d@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
|
856 |
| |
1735
8f902ec9ed9a
bump: copy parent manifest before editting it
Durham Goode <durham@fb.com>
parents:
1710
diff
changeset
|
857 |
o 13:0a2f9b959bb4@default(draft) dansk! |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
858 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
859 |
o 7: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
|
860 |
| |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
861 |
o 6:ba0ec09b1bab@default(public) a nifty feature |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
862 |
| |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
863 |
o 0:e55e0562ee93@default(public) base |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
864 |
|
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
865 |
$ cat > commit-message <<EOF |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
866 |
> A longer |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
867 |
> commit message |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
868 |
> EOF |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
869 |
|
1782
a046e78c3290
fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents:
1779
diff
changeset
|
870 |
$ 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
|
871 |
2 changesets folded |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
872 |
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
|
873 |
$ hg qlog |
1735
8f902ec9ed9a
bump: copy parent manifest before editting it
Durham Goode <durham@fb.com>
parents:
1710
diff
changeset
|
874 |
17 - a00182c58888 A longer |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
875 |
commit message (draft) |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
876 |
7 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public) |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
877 |
6 - ba0ec09b1bab a nifty feature (public) |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
878 |
0 - e55e0562ee93 base (public) |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
879 |
|
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
880 |
$ cd .. |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
881 |
|
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
882 |
Test branch preservation: |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
883 |
=========================== |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
884 |
|
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
885 |
$ hg init evolving-branch |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
886 |
$ cd evolving-branch |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
887 |
$ touch a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
888 |
$ hg add a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
889 |
$ hg ci -m 'a0' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
890 |
$ echo 1 > a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
891 |
$ hg ci -m 'a1' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
892 |
$ echo 2 > a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
893 |
$ hg ci -m 'a2' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
894 |
$ echo 3 > a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
895 |
$ hg ci -m 'a3' |
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 |
$ 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
|
898 |
@ 3 [default] a3 |
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 |
o 2 [default] a2 |
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 |
o 1 [default] a1 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
903 |
| |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
904 |
o 0 [default] a0 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
905 |
|
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
906 |
|
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
907 |
branch change propagated |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
908 |
|
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
909 |
$ hg up 'desc(a2)' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
910 |
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
|
911 |
$ hg branch mybranch |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
912 |
marked working directory as branch mybranch |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
913 |
(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
|
914 |
$ hg amend |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
915 |
1 new unstable changesets |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
916 |
|
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
917 |
$ hg evolve |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
918 |
move:[3] a3 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
919 |
atop:[5] a2 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
920 |
working directory is now at 7c5649f73d11 |
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 |
$ 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
|
923 |
@ 6 [mybranch] a3 |
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 |
o 5 [mybranch] a2 |
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 |
o 1 [default] a1 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
928 |
| |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
929 |
o 0 [default] a0 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
930 |
|
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
931 |
|
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
932 |
branch change preserved |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
933 |
|
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
934 |
$ hg up 'desc(a1)' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
935 |
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
|
936 |
$ hg amend -m 'a1_' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
937 |
2 new unstable changesets |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
938 |
$ hg evolve |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
939 |
move:[5] a2 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
940 |
atop:[7] a1_ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
941 |
working directory is now at eb07e22a0e63 |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
942 |
$ hg evolve |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
943 |
move:[6] a3 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
944 |
atop:[8] a2 |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
945 |
working directory is now at 777c26ca5e78 |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
946 |
$ 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
|
947 |
@ 9 [mybranch] a3 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
948 |
| |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
949 |
o 8 [mybranch] a2 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
950 |
| |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
951 |
o 7 [default] a1_ |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
952 |
| |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
953 |
o 0 [default] a0 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
954 |
|
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 |
|
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
|
956 |
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
|
957 |
|
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
|
958 |
$ hg up 7 |
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
|
959 |
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
|
960 |
$ hg ci --amend -m 'a1__' |
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
|
961 |
2 new unstable 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
|
962 |
|
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
|
963 |
$ hg up 8 |
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
|
964 |
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
|
965 |
$ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
966 |
o 10 [default] a1__ |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
967 |
| |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
968 |
| o 9 [mybranch] a3 |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
969 |
| | |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
970 |
| @ 8 [mybranch] a2 |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
971 |
| | |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
972 |
| x 7 [default] a1_ |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
973 |
|/ |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
974 |
o 0 [default] a0 |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
975 |
|
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
|
976 |
$ hg evolve |
1410
2c451fece7a6
evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1406
diff
changeset
|
977 |
nothing to evolve on current working copy parent |
2c451fece7a6
evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1406
diff
changeset
|
978 |
(2 other unstable 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
|
979 |
[2] |
1194
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
980 |
|
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
981 |
|
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
982 |
Evolve disables active bookmarks. |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
983 |
|
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
984 |
$ hg up 10 |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
985 |
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
|
986 |
$ hg bookmark testbookmark |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
987 |
$ ls .hg/bookmarks* |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
988 |
.hg/bookmarks |
1330
efb75f4d55aa
bookmarks: update to use new bookmarks api via compatibility layer
Ryan McElroy <rmcelroy@fb.com>
parents:
1279
diff
changeset
|
989 |
.hg/bookmarks.* (glob) |
1194
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
990 |
$ hg evolve |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
991 |
move:[8] a2 |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
992 |
atop:[10] a1__ |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
993 |
(leaving bookmark testbookmark) |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
994 |
working directory is now at d952e93add6f |
1194
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
995 |
$ ls .hg/bookmarks* |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
996 |
.hg/bookmarks |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
997 |
|
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
998 |
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
|
999 |
divergent |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1000 |
$ hg up 10 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1001 |
1 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
|
1002 |
$ hg revert -r 11 --all |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1003 |
reverting a |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1004 |
$ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1005 |
o 11 [mybranch] a2 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1006 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1007 |
@ 10 [default] a1__ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1008 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1009 |
| o 9 [mybranch] a3 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1010 |
| | |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1011 |
| x 8 [mybranch] a2 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1012 |
| | |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1013 |
| x 7 [default] a1_ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1014 |
|/ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1015 |
o 0 [default] a0 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1016 |
|
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1017 |
$ echo "hello world" > newfile |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1018 |
$ hg add newfile |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1019 |
$ hg commit -m "add new file bumped" -o 11 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1020 |
$ hg phase --public --hidden 11 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1021 |
1 new bumped changesets |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1022 |
$ hg glog |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1023 |
@ 12 : add new file bumped - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1024 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1025 |
| o 11 : a2 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1026 |
|/ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1027 |
o 10 testbookmark: a1__ - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1028 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1029 |
| o 9 : a3 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1030 |
| | |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1031 |
| x 8 : a2 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1032 |
| | |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1033 |
| x 7 : a1_ - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1034 |
|/ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1035 |
o 0 : a0 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1036 |
|
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1037 |
|
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1038 |
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
|
1039 |
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
|
1040 |
|
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1041 |
$ hg glog |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1042 |
@ 12 : add new file bumped - test |
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 |
| o 11 : a2 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1045 |
|/ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1046 |
o 10 testbookmark: a1__ - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1047 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1048 |
| o 9 : a3 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1049 |
| | |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1050 |
| x 8 : a2 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1051 |
| | |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1052 |
| x 7 : a1_ - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1053 |
|/ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1054 |
o 0 : a0 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1055 |
|
1404
848a04c078c7
evolve: add selector for trouble types
Laurent Charignon <lcharignon@fb.com>
parents:
1398
diff
changeset
|
1056 |
$ hg evolve -r 12 --bumped |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1057 |
recreate:[12] add new file bumped |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1058 |
atop:[11] a2 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1059 |
computing new diff |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1060 |
committed as f15d32934071 |
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1061 |
working directory is now at f15d32934071 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1062 |
$ hg evolve --any |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1063 |
move:[9] a3 |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1064 |
atop:[13] bumped update to d952e93add6f: |
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1065 |
working directory is now at cce26b684bfe |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1066 |
Check that we can resolve troubles in a revset with more than one commit |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1067 |
$ hg up 14 -C |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1068 |
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
|
1069 |
$ mkcommit gg |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1070 |
$ hg up 14 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1071 |
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
|
1072 |
$ mkcommit gh |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1073 |
created new head |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1074 |
$ hg up 14 |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1075 |
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
|
1076 |
$ printf "newline\nnewline\n" >> a |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1077 |
$ hg glog |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1078 |
o 16 : add gh - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1079 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1080 |
| o 15 : add gg - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1081 |
|/ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1082 |
@ 14 : a3 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1083 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1084 |
o 13 : bumped update to d952e93add6f: - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1085 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1086 |
o 11 : a2 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1087 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1088 |
o 10 testbookmark: a1__ - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1089 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1090 |
o 0 : a0 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1091 |
|
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1092 |
$ hg amend |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1093 |
2 new unstable changesets |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1094 |
$ hg glog |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1095 |
@ 18 : a3 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1096 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1097 |
| o 16 : add gh - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1098 |
| | |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1099 |
| | o 15 : add gg - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1100 |
| |/ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1101 |
| x 14 : a3 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1102 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1103 |
o 13 : bumped update to d952e93add6f: - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1104 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1105 |
o 11 : a2 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1106 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1107 |
o 10 testbookmark: a1__ - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1108 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1109 |
o 0 : a0 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1110 |
|
1349
70681abf79d1
evolve: move return statement at the right level
Laurent Charignon <lcharignon@fb.com>
parents:
1336
diff
changeset
|
1111 |
|
70681abf79d1
evolve: move return statement at the right level
Laurent Charignon <lcharignon@fb.com>
parents:
1336
diff
changeset
|
1112 |
Evolving an empty revset should do nothing |
70681abf79d1
evolve: move return statement at the right level
Laurent Charignon <lcharignon@fb.com>
parents:
1336
diff
changeset
|
1113 |
$ hg evolve --rev "16 and 15" |
1410
2c451fece7a6
evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1406
diff
changeset
|
1114 |
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
|
1115 |
[1] |
1349
70681abf79d1
evolve: move return statement at the right level
Laurent Charignon <lcharignon@fb.com>
parents:
1336
diff
changeset
|
1116 |
|
1404
848a04c078c7
evolve: add selector for trouble types
Laurent Charignon <lcharignon@fb.com>
parents:
1398
diff
changeset
|
1117 |
$ hg evolve --rev "14::" --bumped |
1410
2c451fece7a6
evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1406
diff
changeset
|
1118 |
no bumped changesets in specified revisions |
2c451fece7a6
evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1406
diff
changeset
|
1119 |
(do you want to use --unstable) |
2c451fece7a6
evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1406
diff
changeset
|
1120 |
[2] |
1404
848a04c078c7
evolve: add selector for trouble types
Laurent Charignon <lcharignon@fb.com>
parents:
1398
diff
changeset
|
1121 |
$ hg evolve --rev "14::" --unstable |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1122 |
move:[15] add gg |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1123 |
atop:[18] a3 |
1336
10d2ef1f7ed4
evolve: don't use python sets on top of revset for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1331
diff
changeset
|
1124 |
move:[16] add gh |
10d2ef1f7ed4
evolve: don't use python sets on top of revset for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1331
diff
changeset
|
1125 |
atop:[18] a3 |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1126 |
working directory is now at e02107f98737 |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1127 |
$ hg glog |
1336
10d2ef1f7ed4
evolve: don't use python sets on top of revset for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1331
diff
changeset
|
1128 |
@ 20 : add gh - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1129 |
| |
1336
10d2ef1f7ed4
evolve: don't use python sets on top of revset for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents:
1331
diff
changeset
|
1130 |
| o 19 : add gg - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1131 |
|/ |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1132 |
o 18 : a3 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1133 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1134 |
o 13 : bumped update to d952e93add6f: - test |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1135 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1136 |
o 11 : a2 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1137 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1138 |
o 10 testbookmark: a1__ - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1139 |
| |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1140 |
o 0 : a0 - test |
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1141 |
|
1441
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1142 |
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
|
1143 |
$ cat >> $HGRCPATH <<EOF |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1144 |
> [experimental] |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1145 |
> evolution=createmarkers |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1146 |
> EOF |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1147 |
$ hg next |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1148 |
hg: unknown command 'next' |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1149 |
Mercurial Distributed SCM |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1150 |
|
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1151 |
basic commands: |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1152 |
|
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1153 |
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
|
1154 |
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
|
1155 |
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
|
1156 |
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
|
1157 |
diff diff repository (or selected files) |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1158 |
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
|
1159 |
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
|
1160 |
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
|
1161 |
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
|
1162 |
merge merge another revision into working directory |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1163 |
pull pull changes from the specified source |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1164 |
push push changes to the specified destination |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1165 |
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
|
1166 |
serve start stand-alone webserver |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1167 |
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
|
1168 |
summary summarize working directory state |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1169 |
update update working directory (or switch revisions) |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1170 |
|
1737
5383671ef612
evolve: fix test breaks related to double->single quote changes
Kostia Balytskyi <ikostia@fb.com>
parents:
1736
diff
changeset
|
1171 |
(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
|
1172 |
[255] |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1173 |
$ hg fold |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1174 |
hg: unknown command 'fold' |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1175 |
Mercurial Distributed SCM |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1176 |
|
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1177 |
basic commands: |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1178 |
|
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1179 |
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
|
1180 |
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
|
1181 |
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
|
1182 |
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
|
1183 |
diff diff repository (or selected files) |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1184 |
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
|
1185 |
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
|
1186 |
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
|
1187 |
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
|
1188 |
merge merge another revision into working directory |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1189 |
pull pull changes from the specified source |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1190 |
push push changes to the specified destination |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1191 |
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
|
1192 |
serve start stand-alone webserver |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1193 |
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
|
1194 |
summary summarize working directory state |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1195 |
update update working directory (or switch revisions) |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1196 |
|
1737
5383671ef612
evolve: fix test breaks related to double->single quote changes
Kostia Balytskyi <ikostia@fb.com>
parents:
1736
diff
changeset
|
1197 |
(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
|
1198 |
[255] |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1199 |
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
|
1200 |
$ cat >> $HGRCPATH <<EOF |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1201 |
> [experimental] |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1202 |
> evolution=createmarkers |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1203 |
> evolutioncommands=fold |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1204 |
> EOF |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1205 |
$ hg fold |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1206 |
abort: no revisions specified |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1207 |
[255] |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1208 |
$ hg next |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1209 |
hg: unknown command 'next' |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1210 |
Mercurial Distributed SCM |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1211 |
|
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1212 |
basic commands: |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1213 |
|
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1214 |
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
|
1215 |
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
|
1216 |
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
|
1217 |
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
|
1218 |
diff diff repository (or selected files) |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1219 |
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
|
1220 |
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
|
1221 |
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
|
1222 |
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
|
1223 |
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
|
1224 |
merge merge another revision into working directory |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1225 |
pull pull changes from the specified source |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1226 |
push push changes to the specified destination |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1227 |
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
|
1228 |
serve start stand-alone webserver |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1229 |
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
|
1230 |
summary summarize working directory state |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1231 |
update update working directory (or switch revisions) |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1232 |
|
1737
5383671ef612
evolve: fix test breaks related to double->single quote changes
Kostia Balytskyi <ikostia@fb.com>
parents:
1736
diff
changeset
|
1233 |
(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
|
1234 |
[255] |
1325
1fe3da0b4601
evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents:
1283
diff
changeset
|
1235 |
|
1441
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1236 |
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
|
1237 |
|
1441
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1238 |
$ cat >> $HGRCPATH <<EOF |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1239 |
> [experimental] |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1240 |
> evolution=all |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1241 |
> EOF |
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1242 |
|
a4abe588d77f
evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents:
1428
diff
changeset
|
1243 |
Check hg evolve --rev on singled out commit |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1244 |
$ hg up 19 -C |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1245 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1246 |
$ mkcommit j1 |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1247 |
$ mkcommit j2 |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1248 |
$ mkcommit j3 |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1249 |
$ hg up .^^ |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1250 |
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
|
1251 |
$ echo "hello" > j4 |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1252 |
$ hg add j4 |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1253 |
$ hg amend |
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1254 |
2 new unstable changesets |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1364
diff
changeset
|
1255 |
$ glog -r "18::" |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1256 |
@ 25:8dc373be86d9@default(draft) add j1 |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1257 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1258 |
| o 23:d7eadcf6eccd@default(draft) add j3 |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1259 |
| | |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1260 |
| o 22:2223ea564144@default(draft) add j2 |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1261 |
| | |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1262 |
| x 21:48490698b269@default(draft) add j1 |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1263 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1264 |
| o 20:e02107f98737@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
|
1265 |
| | |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1266 |
o | 19:24e63b319adf@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
|
1267 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1268 |
o 18:edc3c9de504e@default(draft) a3 |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1269 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1270 |
~ |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1271 |
|
1405
eaf82490af76
evolve: prevent using --rev and --any together
Laurent Charignon <lcharignon@fb.com>
parents:
1404
diff
changeset
|
1272 |
$ hg evolve --rev 23 --any |
eaf82490af76
evolve: prevent using --rev and --any together
Laurent Charignon <lcharignon@fb.com>
parents:
1404
diff
changeset
|
1273 |
abort: cannot specify both "--rev" and "--any" |
eaf82490af76
evolve: prevent using --rev and --any together
Laurent Charignon <lcharignon@fb.com>
parents:
1404
diff
changeset
|
1274 |
[255] |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1275 |
$ hg evolve --rev 23 |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1276 |
cannot solve instability of d7eadcf6eccd, skipping |
1354
b4a62d6f0353
evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents:
1350
diff
changeset
|
1277 |
|
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1278 |
Check that uncommit respects the allowunstable option |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1279 |
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
|
1280 |
$ cat >> $HGRCPATH <<EOF |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1281 |
> [experimental] |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1282 |
> evolution=createmarkers, allnewcommands |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1283 |
> EOF |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1284 |
$ hg up 8dc373be86d9^ |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1364
diff
changeset
|
1285 |
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
|
1286 |
$ hg uncommit --all |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1287 |
abort: cannot uncommit in the middle of a stack |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1288 |
[255] |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1289 |
$ hg up 8dc373be86d9 |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1364
diff
changeset
|
1290 |
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
|
1291 |
$ hg uncommit --all |
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1292 |
new changeset is empty |
1756
a7dcfff8c4a9
evolve: use single quotes in usage messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
1753
diff
changeset
|
1293 |
(use 'hg prune .' to remove it) |
1370
0799c5831a3d
evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents:
1364
diff
changeset
|
1294 |
$ glog -r "18::" |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1295 |
@ 26:044804d0c10d@default(draft) add j1 |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1296 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1297 |
| o 23:d7eadcf6eccd@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
|
1298 |
| | |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1299 |
| o 22:2223ea564144@default(draft) add j2 |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1300 |
| | |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1301 |
| x 21:48490698b269@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
|
1302 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1303 |
| o 20:e02107f98737@default(draft) add gh |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1304 |
| | |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1305 |
o | 19:24e63b319adf@default(draft) add gg |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1306 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1307 |
o 18:edc3c9de504e@default(draft) a3 |
1364
f00d91365ab9
evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1359
diff
changeset
|
1308 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1309 |
~ |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1310 |
|
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1311 |
Check that prune respects the allowunstable option |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1312 |
$ hg up -C . |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1313 |
0 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
|
1314 |
$ hg up 20 |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
1315 |
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
|
1316 |
$ hg evolve --all |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
1317 |
nothing to evolve on current working copy parent |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
1318 |
(2 other unstable in the repository, do you want --any or --rev) |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
1319 |
[2] |
c868a69c29c5
evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1414
diff
changeset
|
1320 |
$ hg evolve --all --any |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1321 |
move:[22] add j2 |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1322 |
atop:[26] add j1 |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1323 |
move:[23] add j3 |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1324 |
atop:[27] add j2 |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1325 |
working directory is now at c9a20e2d74aa |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1326 |
$ glog -r "18::" |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1327 |
@ 28:c9a20e2d74aa@default(draft) add j3 |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1328 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1329 |
o 27:b0e3066231e2@default(draft) add j2 |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1330 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1331 |
o 26:044804d0c10d@default(draft) add j1 |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1332 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1333 |
| o 20:e02107f98737@default(draft) add gh |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1334 |
| | |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1335 |
o | 19:24e63b319adf@default(draft) add gg |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1336 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1337 |
o 18:edc3c9de504e@default(draft) a3 |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1338 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1339 |
~ |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1340 |
$ hg up 19 |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1341 |
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
|
1342 |
$ mkcommit c5_ |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1343 |
created new head |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1344 |
$ hg prune '26 + 27' |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1345 |
abort: cannot prune in the middle of a stack |
1779
ba9fabaca91b
prune: improve error message if unstable changes are disallowed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
1756
diff
changeset
|
1346 |
(new unstable changesets are not allowed) |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1347 |
[255] |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1348 |
$ hg prune '19::28' |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1349 |
abort: cannot prune in the middle of a stack |
1779
ba9fabaca91b
prune: improve error message if unstable changes are disallowed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
1756
diff
changeset
|
1350 |
(new unstable changesets are not allowed) |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1351 |
[255] |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1352 |
$ hg prune '26::' |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1353 |
3 changesets pruned |
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1354 |
$ glog -r "18::" |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1355 |
@ 29:2251801b6c91@default(draft) add c5_ |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1356 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1357 |
| o 20:e02107f98737@default(draft) add gh |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1358 |
| | |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1359 |
o | 19:24e63b319adf@default(draft) add gg |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1360 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1361 |
o 18:edc3c9de504e@default(draft) a3 |
1397
35f2f54b557c
evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents:
1370
diff
changeset
|
1362 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1363 |
~ |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1364 |
|
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1365 |
Check that fold respects the allowunstable option |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1366 |
$ hg up edc3c9de504e |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1367 |
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
|
1368 |
$ mkcommit unstableifparentisfolded |
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1369 |
created new head |
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1370 |
$ glog -r "18::" |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1371 |
@ 30:68330ac625b8@default(draft) add unstableifparentisfolded |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1372 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1373 |
| o 29:2251801b6c91@default(draft) add c5_ |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1374 |
| | |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1375 |
+---o 20:e02107f98737@default(draft) add gh |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1376 |
| | |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1377 |
| o 19:24e63b319adf@default(draft) add gg |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1378 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1379 |
o 18:edc3c9de504e@default(draft) a3 |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1380 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1381 |
~ |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1382 |
|
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1383 |
$ hg fold --exact "19 + 18" |
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1384 |
abort: cannot fold chain not ending with a head or with branching |
1779
ba9fabaca91b
prune: improve error message if unstable changes are disallowed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
1756
diff
changeset
|
1385 |
(new unstable changesets are not allowed) |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1386 |
[255] |
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1387 |
$ hg fold --exact "18::29" |
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1388 |
abort: cannot fold chain not ending with a head or with branching |
1779
ba9fabaca91b
prune: improve error message if unstable changes are disallowed
Pulkit Goyal <7895pulkit@gmail.com>
parents:
1756
diff
changeset
|
1389 |
(new unstable changesets are not allowed) |
1398
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1390 |
[255] |
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1391 |
$ hg fold --exact "19::" |
7ddcbf5469bc
evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents:
1397
diff
changeset
|
1392 |
2 changesets folded |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1393 |
|
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1394 |
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
|
1395 |
-------------------------------------- |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1396 |
|
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1397 |
$ cat >> $HGRCPATH <<EOF |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1398 |
> [experimental] |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1399 |
> evolution=all |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1400 |
> EOF |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1401 |
|
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1402 |
$ glog -r "18::" |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1403 |
o 31:580886d07058@default(draft) add gg |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1404 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1405 |
| @ 30:68330ac625b8@default(draft) add unstableifparentisfolded |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1406 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1407 |
| o 20:e02107f98737@default(draft) add gh |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1408 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1409 |
o 18:edc3c9de504e@default(draft) a3 |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1410 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1411 |
~ |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1412 |
|
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1413 |
Create a split commit |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1414 |
$ printf "oo" > oo; |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1415 |
$ printf "pp" > pp; |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1416 |
$ hg add oo pp |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1417 |
$ hg commit -m "oo+pp" |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1418 |
$ mkcommit uu |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1419 |
$ hg up 30 |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1420 |
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
|
1421 |
$ printf "oo" > oo; |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1422 |
$ hg add oo |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1423 |
$ hg commit -m "_oo" |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1424 |
created new head |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1425 |
$ printf "pp" > pp; |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1426 |
$ hg add pp |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1427 |
$ 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
|
1428 |
$ 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
|
1429 |
1 changesets pruned |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1430 |
1 new unstable changesets |
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1431 |
$ glog -r "18::" |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1432 |
@ 35:7a555adf2b4a@default(draft) _pp |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1433 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1434 |
o 34:2be4d2d5bf34@default(draft) _oo |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1435 |
| |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1436 |
| o 33:53f0c003e03e@default(draft) add uu |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1437 |
| | |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1438 |
| x 32:1bf2152f4f82@default(draft) oo+pp |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1439 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1440 |
| o 31:580886d07058@default(draft) add gg |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1441 |
| | |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1442 |
o | 30:68330ac625b8@default(draft) add unstableifparentisfolded |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1443 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1444 |
| o 20:e02107f98737@default(draft) add gh |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1445 |
|/ |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1446 |
o 18:edc3c9de504e@default(draft) a3 |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1447 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1448 |
~ |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1449 |
$ hg evolve --rev "18::" |
1481
3c0aebe73482
evolve: handle split commit for instability
Laurent Charignon <lcharignon@fb.com>
parents:
1471
diff
changeset
|
1450 |
move:[33] add uu |
3c0aebe73482
evolve: handle split commit for instability
Laurent Charignon <lcharignon@fb.com>
parents:
1471
diff
changeset
|
1451 |
atop:[35] _pp |
1510
b86eea66ed02
evolve: be more complete about copying extra from old revisions
Augie Fackler <raf@durin42.com>
parents:
1481
diff
changeset
|
1452 |
working directory is now at 43c3f5ef149f |
1428
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1453 |
|
20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
1426
diff
changeset
|
1454 |
|
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1455 |
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
|
1456 |
---------------------------------------- |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1457 |
|
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1458 |
$ 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
|
1459 |
$ 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
|
1460 |
$ hg parents |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1461 |
37 : will be amended - test |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1462 |
|
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1463 |
$ 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
|
1464 |
$ 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
|
1465 |
|
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1466 |
$ 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
|
1467 |
$ 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
|
1468 |
$ 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
|
1469 |
$ 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
|
1470 |
|
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1471 |
$ hg update -q 37 |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1472 |
$ 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
|
1473 |
$ hg amend -m "amended" |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1474 |
2 new unstable changesets |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1475 |
|
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1476 |
$ hg evolve --rev "37::" |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1477 |
move:[38] 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
|
1478 |
atop:[41] amended |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1479 |
move:[39] 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
|
1480 |
atop:[42] 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
|
1481 |
merging newfile |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1482 |
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
|
1483 |
evolve failed! |
1756
a7dcfff8c4a9
evolve: use single quotes in usage messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
1753
diff
changeset
|
1484 |
fix conflict and run 'hg evolve --continue' or use 'hg update -C .' 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
|
1485 |
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
|
1486 |
[255] |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1487 |
|
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1488 |
$ glog -r "36::" --hidden |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1489 |
@ 42:c904da5245b0@default(draft) 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
|
1490 |
| |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1491 |
o 41:34ae045ec400@default(draft) amended |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1492 |
| |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1493 |
| x 40:e88bee38ffc2@default(draft) temporary amend commit for 36030b147271 |
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 |
| | o 39:02e943732647@default(draft) 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
|
1496 |
| | | |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1497 |
| | x 38:f8e30e9317aa@default(draft) 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
|
1498 |
| |/ |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1499 |
| x 37:36030b147271@default(draft) 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
|
1500 |
|/ |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1501 |
o 36:43c3f5ef149f@default(draft) add uu |
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1502 |
| |
1641
27445da063b7
tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1631
diff
changeset
|
1503 |
~ |
1594
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1504 |
|
de43a3e6b358
evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
1587
diff
changeset
|
1505 |
$ 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
|
1506 |
A newlyadded |