Mercurial > evolve
annotate tests/test-evolve.t @ 1239:8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Prune used to compute the destination commit to update to after creating the
obsolescence markers. This is a commit to prevent a bug that would occur
with the changes in inhibit for transactions (next commit).
Indeed, with that change in inhibit, when creating the obsolescence markers in
prune, they would get inhibited right away and we wouldn't update to the first
non obsolete parent but stay on the same node as its obsolescence would have
been inhibited (bug).
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Thu, 02 Apr 2015 18:33:44 -0700 |
parents | 0d15d461a316 |
children | 35d8789ea7a8 |
rev | line source |
---|---|
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
2 > [defaults] |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
3 > amend=-d "0 0" |
915
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
4 > fold=-d "0 0" |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
5 > [web] |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
6 > push_ssl = false |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
7 > allow_push = * |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
8 > [phases] |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
9 > publish = False |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
10 > [alias] |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
11 > 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
|
12 > [diff] |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
13 > git = 1 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
14 > unified = 0 |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
15 > [extensions] |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
16 > hgext.graphlog= |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
17 > EOF |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
18 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 $ mkcommit() { |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
20 > echo "$1" > "$1" |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 > hg add "$1" |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 > hg ci -m "add $1" |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 > } |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
24 |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
25 $ glog() { |
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
26 > 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
|
27 > } |
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
28 |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
29 various init |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
30 |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
31 $ hg init local |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
32 $ cd local |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
33 $ mkcommit a |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
34 $ mkcommit b |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
35 $ cat >> .hg/hgrc << EOF |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
36 > [phases] |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
37 > publish = True |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
38 > EOF |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
39 $ 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
|
40 $ rm .hg/hgrc |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
41 $ mkcommit c |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
42 $ mkcommit d |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
43 $ hg up 1 |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
44 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
|
45 $ mkcommit e -q |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
46 created new head |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
47 $ mkcommit f |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
48 $ hg qlog |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
49 5 - e44648563c73 add f (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
50 4 - fbb94e3a0ecf add e (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
51 3 - 47d2a3944de8 add d (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
52 2 - 4538525df7e2 add c (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
53 1 - 7c3bad9141dc add b (public) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
54 0 - 1f0dee641bb7 add a (public) |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
55 |
414
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
56 test kill and immutable changeset |
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
57 |
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
58 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
59 1 public stable |
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
60 $ hg kill 1 |
687
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
652
diff
changeset
|
61 abort: cannot prune immutable changeset: 7c3bad9141dc |
6c1fbef2952e
prune: test and improve message of immutable aborting.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
652
diff
changeset
|
62 (see "hg help phases" for details) |
444
aedb6b8ace86
drop repo.addobsolete
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
443
diff
changeset
|
63 [255] |
414
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
64 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
65 1 public stable |
299af91b8b6e
evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
66 |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
67 test simple kill |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
68 |
317
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
69 $ hg id -n |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
70 5 |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
71 $ hg kill . |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
72 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
|
73 working directory now at fbb94e3a0ecf |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1197
diff
changeset
|
74 1 changesets pruned |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
75 $ hg qlog |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
76 4 - fbb94e3a0ecf add e (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
77 3 - 47d2a3944de8 add d (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
78 2 - 4538525df7e2 add c (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
79 1 - 7c3bad9141dc add b (public) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
80 0 - 1f0dee641bb7 add a (public) |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
81 |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
82 test multiple kill |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
83 |
644
8e41d5b78dff
support -r option in prune, add a test for this
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
620
diff
changeset
|
84 $ hg kill 4 -r 3 |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
85 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
|
86 working directory now at 7c3bad9141dc |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1197
diff
changeset
|
87 2 changesets pruned |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
88 $ hg qlog |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
89 2 - 4538525df7e2 add c (draft) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
90 1 - 7c3bad9141dc add b (public) |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
91 0 - 1f0dee641bb7 add a (public) |
317
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
92 |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
93 test kill with dirty changes |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
94 |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
95 $ hg up 2 |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
96 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
|
97 $ echo 4 > g |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
98 $ hg add g |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
99 $ hg kill . |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
100 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
|
101 working directory now at 7c3bad9141dc |
1239
8a06b32061ce
evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents:
1197
diff
changeset
|
102 1 changesets pruned |
317
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
103 $ hg st |
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
104 A g |
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
105 $ cd .. |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
106 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
107 ########################## |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
108 importing Parren test |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
109 ########################## |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
110 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
111 $ cat << EOF >> $HGRCPATH |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
112 > [ui] |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
113 > 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
|
114 > EOF |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
115 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
116 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
|
117 =============================== |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
118 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
119 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
|
120 ------------------- |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
121 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
122 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
|
123 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
124 $ 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
|
125 $ 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
|
126 > One |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
127 > |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
128 > Two |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
129 > |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
130 > Three |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
131 > EOF |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
132 $ 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
|
133 $ hg add |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
134 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
|
135 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
|
136 $ 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
|
137 $ cd .. |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
138 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
139 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
|
140 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
141 $ 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
|
142 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
|
143 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
|
144 $ cd work |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
145 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
146 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
147 Create First Patch |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
148 ------------------ |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
149 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
150 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
|
151 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
152 $ 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
|
153 $ 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
|
154 $ 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
|
155 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
156 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
|
157 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
158 $ hg diff |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
159 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
|
160 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
|
161 --- /dev/null |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
162 +++ 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
|
163 @@ -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
|
164 +One |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
165 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
|
166 --- 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
|
167 +++ 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
|
168 @@ -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
|
169 -One |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
170 +Eins |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
171 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
172 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
|
173 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
174 $ 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
|
175 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
176 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
|
177 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
178 $ 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
|
179 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
180 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
181 Create Second Patch |
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 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
184 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
|
185 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
186 $ 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
|
187 $ 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
|
188 $ 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
|
189 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
190 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
|
191 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
|
192 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
|
193 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
194 $ 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
|
195 $ 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
|
196 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
197 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
|
198 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
199 $ hg book |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
200 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
|
201 * 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
|
202 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
203 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
204 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
|
205 -------------------- |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
206 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
207 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
|
208 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
209 $ 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
|
210 +Zwie |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
211 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
212 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
|
213 |
88
64fe5a4f877e
[evolution] first workign draft of a relocate function
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
87
diff
changeset
|
214 $ 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
|
215 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
216 and **amend**:: |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
217 |
741
892a6d708c8f
amend: drop the deprecated note option
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
718
diff
changeset
|
218 $ hg amend |
82
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
219 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
220 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
|
221 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
|
222 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
223 $ 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
|
224 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
|
225 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
|
226 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
|
227 |
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
228 $ hg up feature-A -q |
139
9b9500175ae5
evolve that does something \o/
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
138
diff
changeset
|
229 $ 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
|
230 $ 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
|
231 |
475
9f69a5e41ab0
[evolve] amend: check phase before starting the transition
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
474
diff
changeset
|
232 (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
|
233 |
474
5c031e1c90e2
test: turn the base public
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
418
diff
changeset
|
234 $ hg phase --public 0 -v |
5c031e1c90e2
test: turn the base public
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
418
diff
changeset
|
235 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
|
236 |
9f69a5e41ab0
[evolve] amend: check phase before starting the transition
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
474
diff
changeset
|
237 |
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
|
238 (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
|
239 |
741
892a6d708c8f
amend: drop the deprecated note option
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
718
diff
changeset
|
240 $ hg amend |
486 | 241 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
|
242 $ hg log |
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
243 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
|
244 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
|
245 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
|
246 0 : base - test |
302
d68ccae92d52
obsolete: make collapse create less markers
Patrick Mezard <patrick@mezard.eu>
parents:
296
diff
changeset
|
247 $ hg up -q 0 |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
248 $ glog --hidden |
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
741
diff
changeset
|
249 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
|
250 | |
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
741
diff
changeset
|
251 | 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
|
252 | | |
1104
cb36a4eb0157
evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1099
diff
changeset
|
253 | | 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
|
254 | |/ |
1104
cb36a4eb0157
evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1099
diff
changeset
|
255 | | 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
|
256 | | | |
1104
cb36a4eb0157
evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1099
diff
changeset
|
257 | | 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
|
258 | |/ |
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
317
diff
changeset
|
259 | 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
|
260 |/ |
474
5c031e1c90e2
test: turn the base public
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
418
diff
changeset
|
261 @ 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
|
262 |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
263 $ hg debugobsolete |
1104
cb36a4eb0157
evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1099
diff
changeset
|
264 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'user': 'test'} (glob) |
cb36a4eb0157
evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1099
diff
changeset
|
265 c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'user': 'test'} (glob) |
1065
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1040
diff
changeset
|
266 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'user': 'test'} (glob) |
1067
5d063fed9e3d
evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1065
diff
changeset
|
267 c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'user': 'test'} (glob) |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
268 $ hg evolve |
1104
cb36a4eb0157
evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
1099
diff
changeset
|
269 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
|
270 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
|
271 merging main-file-1 |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
272 working directory is now at 5c9c8d9c2e4e |
87
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
273 $ 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
|
274 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
|
275 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
|
276 0 : base - test |
116
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
277 |
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
278 Test commit -o options |
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
279 |
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
280 $ hg up 6 |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
281 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
|
282 $ hg revert -r 7 --all |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
283 adding file-from-B |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
284 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
|
285 $ 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
|
286 $ 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
|
287 created new head |
116
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
288 $ hg log |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
289 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
|
290 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
|
291 0 : base - test |
309
de21685d22d1
evolve: warn when latecomer changeset are created
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
302
diff
changeset
|
292 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
293 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
|
294 |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
295 $ hg phase --hidden --public 7 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
296 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
|
297 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
298 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
|
299 |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
300 $ 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
|
301 @ 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
|
302 | |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
303 | 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
|
304 |/ |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
305 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
|
306 | |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
307 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
|
308 |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
309 $ hg evolve --any --traceback |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
310 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
|
311 atop:[7] another feature (child of ba0ec09b1bab) |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
312 computing new diff |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
313 committed as 476d0454d60e |
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
314 working directory is now at 476d0454d60e |
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
|
315 $ hg glog |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
316 @ 9 feature-B: bumped update to 5c9c8d9c2e4e: - 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
|
317 | |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
318 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
|
319 | |
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
|
320 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
|
321 | |
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
446
diff
changeset
|
322 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
|
323 |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
324 $ hg diff --hidden -r 9 -r 8 |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
325 $ hg diff -r 9^ -r 9 |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
326 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
|
327 --- a/main-file-1 |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
328 +++ b/main-file-1 |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
329 @@ -3,1 +3,1 @@ |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
330 -Zwei |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
331 +deux |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
332 $ 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
|
333 |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
334 test evolve --all |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
335 $ 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
|
336 $ hg commit -m 'dansk 2!' |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
337 $ 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
|
338 $ hg commit -m 'dansk 3!' |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
339 $ hg update 9 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
340 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
|
341 $ 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
|
342 $ hg commit --amend -m 'dansk!' |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
343 2 new unstable changesets |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
344 |
982
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
345 (ninja test for the {trouble} template: |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
346 |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
347 $ hg log -G --template '{rev} {troubles}\n' |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
348 @ 13 |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
349 | |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
350 | o 11 unstable |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
351 | | |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
352 | o 10 unstable |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
353 | | |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
354 | x 9 |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
355 |/ |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
356 o 7 |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
357 | |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
358 o 6 |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
359 | |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
360 o 0 |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
361 |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
362 |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
363 |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
364 (/ninja) |
1c7b73739a0d
template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
964
diff
changeset
|
365 |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
366 $ hg evolve --all --traceback |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
367 move:[10] dansk 2! |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
368 atop:[13] dansk! |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
369 merging main-file-1 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
370 move:[11] dansk 3! |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
371 atop:[14] dansk 2! |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
372 merging main-file-1 |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
373 working directory is now at cfb5ebed336d |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
374 $ hg glog |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
375 @ 15 : dansk 3! - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
376 | |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
377 o 14 : dansk 2! - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
378 | |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
379 o 13 feature-B: dansk! - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
380 | |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
381 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
|
382 | |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
383 o 6 feature-A: a nifty feature - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
384 | |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
385 o 0 : base - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
386 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
387 |
196
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
388 $ cd .. |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
389 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
390 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
|
391 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
392 $ 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
|
393 > [format] |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
394 > generaldelta=1 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
395 > EOF |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
396 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
397 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
398 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
399 $ 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
|
400 $ cd alpha |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
401 $ 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
|
402 $ 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
|
403 $ 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
|
404 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
405 $ cd .. |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
406 $ 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
|
407 adding changesets |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
408 adding manifests |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
409 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
|
410 added 1 changesets with 1 changes to 1 files |
1038
45c4739e85dc
evolve: make the "pulling obsolescence marker" message important
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1035
diff
changeset
|
411 pull 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
|
412 $ cd alpha |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
413 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
414 $ 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
|
415 > We |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
416 > need |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
417 > some |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
418 > kind |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
419 > of |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
420 > file |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
421 > big |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
422 > enough |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
423 > to |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
424 > prevent |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
425 > snapshot |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
426 > . |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
427 > yes |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
428 > new |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
429 > lines |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
430 > are |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
431 > useless |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
432 > . |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
433 > EOF |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
434 $ 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
|
435 $ 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
|
436 $ 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
|
437 $ echo '.' >> B |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
438 $ 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
|
439 $ hg verify |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
440 checking changesets |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
441 checking manifests |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
442 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
|
443 checking files |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
444 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
|
445 $ 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
|
446 abort: empty revision set |
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
447 [255] |
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
448 $ hg --config extensions.hgext.mq= strip --hidden 'extinct()' |
1195
af9fd422adbb
tests: update to new core output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1188
diff
changeset
|
449 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
|
450 $ hg verify |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
451 checking changesets |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
452 checking manifests |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
453 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
|
454 checking files |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
455 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
|
456 $ cd .. |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
457 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
458 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
|
459 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
460 $ cd beta |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
461 $ 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
|
462 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
|
463 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
|
464 adding changesets |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
465 adding manifests |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
466 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
|
467 added 1 changesets with 1 changes to 1 files |
1038
45c4739e85dc
evolve: make the "pulling obsolescence marker" message important
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1035
diff
changeset
|
468 pull obsolescence markers |
1040
640f3280559e
evolve: add "obsolescence" in front of marked in the previous message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1039
diff
changeset
|
469 2 obsolescence markers added |
196
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
470 (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
|
471 $ hg up |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
472 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
|
473 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
474 $ cd .. |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
475 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
476 Test graft --obsolete/--old-obsolete |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
477 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
478 $ hg init test-graft |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
479 $ cd test-graft |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
480 $ mkcommit 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
481 $ mkcommit 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
482 $ mkcommit 2 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
483 $ mkcommit 3 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
484 $ hg up -qC 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
485 $ mkcommit 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
486 created new head |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
487 $ glog --hidden |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
488 @ 4:ce341209337f@default(draft) add 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
489 | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
490 | o 3:0e84df4912da@default(draft) add 3 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
491 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
492 | o 2:db038628b9e5@default(draft) add 2 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
493 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
494 | o 1:73d38bb17fd7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
495 |/ |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
496 o 0:8685c6d34325@default(draft) add 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
497 |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
498 $ 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
|
499 grafting 3:0e84df4912da "add 3" |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
500 $ 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
|
501 grafting 1:73d38bb17fd7 "add 1" |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
502 $ glog --hidden |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
503 @ 6:acb28cd497b7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
504 | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
505 o 5:0b9e50c35132@default(draft) add 3 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
506 | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
507 o 4:ce341209337f@default(draft) add 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
508 | |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
509 | x 3:0e84df4912da@default(draft) add 3 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
510 | | |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
511 | x 2:db038628b9e5@default(draft) add 2 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
512 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
513 | o 1:73d38bb17fd7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
514 |/ |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
515 o 0:8685c6d34325@default(draft) add 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
516 |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
517 $ hg debugobsolete |
1065
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1040
diff
changeset
|
518 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'user': 'test'} (glob) |
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1040
diff
changeset
|
519 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'user': 'test'} (glob) |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
520 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
521 Test graft --continue |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
522 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
523 $ hg up -qC 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
524 $ echo 2 > 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
525 $ hg ci -Am conflict 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
526 created new head |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
527 $ hg up -qC 6 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
528 $ 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
|
529 grafting 7:a5bfd90a2f29 "conflict" (tip) |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
530 merging 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
531 warning: conflicts during merge. |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
532 merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark') |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
533 abort: unresolved conflicts, can't continue |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
534 (use hg resolve and hg graft --continue) |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
535 [255] |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
536 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
537 7:a5bfd90a2f29 stable |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
538 $ echo 3 > 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
539 $ 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
|
540 (no more unresolved files) |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
541 $ 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
|
542 grafting 7:a5bfd90a2f29 "conflict" (tip) |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
543 $ glog --hidden |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
544 @ 8:920e58bb443b@default(draft) conflict |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
545 | |
420 | 546 | x 7:a5bfd90a2f29@default(draft) conflict |
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 o | 6:acb28cd497b7@default(draft) add 1 |
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 o | 5:0b9e50c35132@default(draft) add 3 |
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 o | 4:ce341209337f@default(draft) add 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
553 |/ |
420 | 554 | x 3:0e84df4912da@default(draft) add 3 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
555 | | |
420 | 556 | x 2:db038628b9e5@default(draft) add 2 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
557 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
558 | o 1:73d38bb17fd7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
559 |/ |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
560 o 0:8685c6d34325@default(draft) add 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
561 |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
562 $ hg debugobsolete |
1065
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1040
diff
changeset
|
563 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'user': 'test'} (glob) |
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1040
diff
changeset
|
564 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'user': 'test'} (glob) |
f355bbc124fc
test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1040
diff
changeset
|
565 a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (*) {'user': 'test'} (glob) |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
566 |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
567 Test touch |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
568 |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
569 $ glog |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
570 @ 8:920e58bb443b@default(draft) conflict |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
571 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
572 o 6:acb28cd497b7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
573 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
574 o 5:0b9e50c35132@default(draft) add 3 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
575 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
576 o 4:ce341209337f@default(draft) add 4 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
577 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
578 | o 1:73d38bb17fd7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
579 |/ |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
580 o 0:8685c6d34325@default(draft) add 0 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
581 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
582 $ hg touch |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
583 $ glog |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
584 @ 9:*@default(draft) conflict (glob) |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
585 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
586 o 6:acb28cd497b7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
587 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
588 o 5:0b9e50c35132@default(draft) add 3 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
589 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
590 o 4:ce341209337f@default(draft) add 4 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
591 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
592 | o 1:73d38bb17fd7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
593 |/ |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
594 o 0:8685c6d34325@default(draft) add 0 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
595 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
596 $ hg touch . |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
597 $ glog |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
598 @ 10:*@default(draft) conflict (glob) |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
599 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
600 o 6:acb28cd497b7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
601 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
602 o 5:0b9e50c35132@default(draft) add 3 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
603 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
604 o 4:ce341209337f@default(draft) add 4 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
605 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
606 | o 1:73d38bb17fd7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
607 |/ |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
608 o 0:8685c6d34325@default(draft) add 0 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
609 |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
610 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
611 Test fold |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
612 |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
613 $ rm *.orig |
561
897f6da2314e
fold: handle the lack of revision to fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
553
diff
changeset
|
614 $ 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
|
615 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
|
616 [255] |
995
0f3a7efd6ee9
fold: emit error message when folding a single revision
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
994
diff
changeset
|
617 $ hg fold . |
0f3a7efd6ee9
fold: emit error message when folding a single revision
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
994
diff
changeset
|
618 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
|
619 [1] |
998
85ec2a55fe7c
fold: improve error messages for multiple heads and roots
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
997
diff
changeset
|
620 $ 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
|
621 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
|
622 [255] |
85ec2a55fe7c
fold: improve error messages for multiple heads and roots
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
997
diff
changeset
|
623 $ 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
|
624 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
|
625 [255] |
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
626 $ hg fold 10 1 |
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
627 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
|
628 (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
|
629 [255] |
997
f48cd2f48d14
fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
996
diff
changeset
|
630 $ hg phase --public 0 |
f48cd2f48d14
fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
996
diff
changeset
|
631 $ hg fold -r 0 |
f48cd2f48d14
fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
996
diff
changeset
|
632 abort: cannot fold public revisions |
f48cd2f48d14
fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
996
diff
changeset
|
633 [255] |
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
634 $ hg fold -r 5 |
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
635 3 changesets folded |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
636 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
637 $ hg fold 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
|
638 abort: hidden revision '6'! |
8b3b0549a4b6
test: adapt to new hidden-changeset message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1128
diff
changeset
|
639 (use --hidden to access hidden revisions) |
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
640 [255] |
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
641 $ 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
|
642 add 3 |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
643 |
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
644 |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
645 add 1 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
646 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
647 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
648 conflict |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
649 $ hg debugrebuildstate |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
650 $ hg st |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
651 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
652 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
|
653 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
654 $ hg up 4 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
655 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
|
656 $ 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
|
657 2 changesets folded |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
658 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
|
659 $ glog |
915
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
660 @ 12:d26d339c513f@default(draft) add 4 |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
661 | |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
662 | o 1:73d38bb17fd7@default(draft) add 1 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
663 |/ |
997
f48cd2f48d14
fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
996
diff
changeset
|
664 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
|
665 |
915
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
666 $ hg log --template '{rev}: {author}\n' |
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
667 12: victor |
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
668 1: test |
1ebe5c51919b
fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
901
diff
changeset
|
669 0: test |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
670 $ hg log -r 12 --template '{desc}\n' |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
671 add 4 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
672 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
673 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
674 add 3 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
675 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
676 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
677 add 1 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
678 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
679 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
680 conflict |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
681 $ hg debugrebuildstate |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
682 $ hg st |
483
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
683 |
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
684 Test olog |
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
685 |
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
686 $ hg olog |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
687 4 : add 4 - test |
996
b98dd5d3065c
fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
995
diff
changeset
|
688 11 : add 3 - test |
901
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
689 |
807
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
690 Test obsstore stat |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
691 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
692 $ hg debugobsstorestat |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
693 markers total: 10 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
694 for known precursors: 10 |
809
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
695 with parents data: 0 |
807
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
696 markers with no successors: 0 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
697 1 successors: 10 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
698 2 successors: 0 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
699 more than 2 successors: 0 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
700 available keys: |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
701 user: 10 |
809
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
702 disconnected clusters: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
703 any known node: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
704 smallest length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
705 longer length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
706 median length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
707 mean length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
708 using parents data: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
709 any known node: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
710 smallest length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
711 longer length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
712 median length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
713 mean length: 10 |
907 | 714 |
901
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
715 |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
716 Test evolving renames |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
717 |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
718 $ hg up null |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
719 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
|
720 $ echo a > a |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
721 $ hg ci -Am a |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
722 adding a |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
723 created new head |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
724 $ echo b > b |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
725 $ hg ci -Am b |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
726 adding b |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
727 $ hg mv a c |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
728 $ hg ci -m c |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
729 $ hg kill .^ |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
730 1 changesets pruned |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
731 1 new unstable changesets |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
732 $ hg stab --any |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
733 move:[15] c |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
734 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
|
735 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
|
736 $ hg st -C --change=tip |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
737 A c |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
738 a |
4f84b3307dc2
Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents:
742
diff
changeset
|
739 R a |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
740 |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
741 Test fold with commit messages |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
742 |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
743 $ cd ../work |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
744 $ hg fold .^ --message "Folding with custom commit message" |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
745 2 changesets folded |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
746 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
|
747 $ glog |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
748 @ 16:d6239ff09c9f@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
|
749 | |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
750 o 13:56ade053f46d@default(draft) dansk! |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
751 | |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
752 o 7:5c9c8d9c2e4e@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
|
753 | |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
754 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
|
755 | |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
756 o 0:e55e0562ee93@default(public) base |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
757 |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
758 $ cat > commit-message <<EOF |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
759 > A longer |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
760 > commit message |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
761 > EOF |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
762 |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
763 $ hg fold .^ --logfile commit-message |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
764 2 changesets folded |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
765 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
|
766 $ hg qlog |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
767 17 - dba606655966 A longer |
933
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
768 commit message (draft) |
1106
6b0cf1b73693
evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents:
1105
diff
changeset
|
769 7 - 5c9c8d9c2e4e 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
|
770 6 - ba0ec09b1bab a nifty feature (public) |
e5baeb8fefec
fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
915
diff
changeset
|
771 0 - e55e0562ee93 base (public) |
1141
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
772 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
773 $ cd .. |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
774 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
775 Test branch preservation: |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
776 =========================== |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
777 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
778 $ hg init evolving-branch |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
779 $ cd evolving-branch |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
780 $ touch a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
781 $ hg add a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
782 $ hg ci -m 'a0' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
783 $ echo 1 > a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
784 $ hg ci -m 'a1' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
785 $ echo 2 > a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
786 $ hg ci -m 'a2' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
787 $ echo 3 > a |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
788 $ hg ci -m 'a3' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
789 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
790 $ 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
|
791 @ 3 [default] a3 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
792 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
793 o 2 [default] a2 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
794 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
795 o 1 [default] a1 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
796 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
797 o 0 [default] a0 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
798 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
799 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
800 branch change propagated |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
801 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
802 $ hg up 'desc(a2)' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
803 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
|
804 $ hg branch mybranch |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
805 marked working directory as branch mybranch |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
806 (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
|
807 $ hg amend |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
808 1 new unstable changesets |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
809 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
810 $ hg evolve |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
811 move:[3] a3 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
812 atop:[5] a2 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
813 working directory is now at 7c5649f73d11 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
814 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
815 $ 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
|
816 @ 6 [mybranch] a3 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
817 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
818 o 5 [mybranch] a2 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
819 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
820 o 1 [default] a1 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
821 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
822 o 0 [default] a0 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
823 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
824 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
825 branch change preserved |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
826 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
827 $ hg up 'desc(a1)' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
828 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
|
829 $ hg amend -m 'a1_' |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
830 2 new unstable changesets |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
831 $ hg evolve |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
832 move:[5] a2 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
833 atop:[7] a1_ |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
834 working directory is now at 5406c5cfee42 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
835 $ hg evolve |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
836 move:[6] a3 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
837 atop:[8] a2 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
838 working directory is now at c7661e655801 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
839 $ 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
|
840 @ 9 [mybranch] a3 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
841 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
842 o 8 [mybranch] a2 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
843 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
844 o 7 [default] a1_ |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
845 | |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
846 o 0 [default] a0 |
ca17770d2ee9
evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1133
diff
changeset
|
847 |
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
|
848 |
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
|
849 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
|
850 |
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
|
851 $ 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
|
852 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
|
853 $ 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
|
854 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
|
855 |
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
|
856 $ 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
|
857 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
|
858 $ hg evolve |
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
|
859 nothing to evolve here |
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
|
860 (2 troubled changesets, do you want --any ?) |
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
|
861 [2] |
1194
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
862 |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
863 |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
864 Evolve disables active bookmarks. |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
865 |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
866 $ hg up 10 |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
867 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
|
868 $ hg bookmark testbookmark |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
869 $ ls .hg/bookmarks* |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
870 .hg/bookmarks |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
871 .hg/bookmarks.current |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
872 $ hg evolve |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
873 move:[8] a2 |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
874 atop:[10] a1__ |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
875 (leaving bookmark testbookmark) |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
876 working directory is now at f37ed7a60f43 |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
877 $ ls .hg/bookmarks* |
aa7cdd9d7310
evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents:
1185
diff
changeset
|
878 .hg/bookmarks |