Mercurial > evolve
annotate tests/test-evolve.t @ 852:aa722de36179
exchange: fix pulling from simple for server
There is far too much code duplication down there.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Mon, 03 Mar 2014 21:37:18 -0800 |
parents | 9aa20585e158 |
children | 5c40b2a4b52f |
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" |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
4 > [web] |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
5 > push_ssl = false |
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
6 > allow_push = * |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
7 > [phases] |
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
8 > publish = False |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
9 > [alias] |
113
3bdabdbb4140
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
94
diff
changeset
|
10 > 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
|
11 > [diff] |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
12 > git = 1 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
13 > unified = 0 |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
14 > [extensions] |
87
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
15 > hgext.rebase= |
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 . |
688
f2c3fd21fa63
prune: add an informative message about the number of pruned changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
687
diff
changeset
|
72 1 changesets pruned |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
73 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
|
74 working directory now at fbb94e3a0ecf |
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 |
688
f2c3fd21fa63
prune: add an informative message about the number of pruned changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
687
diff
changeset
|
85 2 changesets pruned |
81
5cec25ce019c
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
86 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
|
87 working directory now at 7c3bad9141dc |
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 . |
688
f2c3fd21fa63
prune: add an informative message about the number of pruned changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
687
diff
changeset
|
100 1 changesets pruned |
317
c099ed0dd472
evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
309
diff
changeset
|
101 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
|
102 working directory now at 7c3bad9141dc |
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 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
195 $ hg commit --message "another feature" |
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 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
201 * feature-B 2:7b36850622b2 |
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 |
8108d566a8b5
[evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
81
diff
changeset
|
224 4 feature-B: another feature - test |
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 |
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
244 4 feature-B: another feature - test |
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 | | |
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
741
diff
changeset
|
253 | | o 4:207cbc4ea7fe@default(draft) another feature |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
254 | |/ |
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
741
diff
changeset
|
255 | | x 3:5bb880fc0f12@default(draft) temporary amend commit for 7b36850622b2 |
296
c3ff47e6bd36
test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
256 | | | |
385
cdcdedc532b7
obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
346
diff
changeset
|
257 | | x 2:7b36850622b2@default(draft) another feature |
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 |
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
741
diff
changeset
|
264 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 207cbc4ea7fee30d18b3a25f534fe5db22c6071b 0 {'date': '* *', 'user': 'test'} (glob) |
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
741
diff
changeset
|
265 5bb880fc0f12dd61eee6de36f62b93fdbc3684b0 0 {'date': '* *', 'user': 'test'} (glob) |
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
741
diff
changeset
|
266 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 {'date': '* *', 'user': 'test'} (glob) |
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
741
diff
changeset
|
267 c296b79833d1d497f33144786174bf35e04e44a3 0 {'date': '* *', 'user': 'test'} (glob) |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
268 $ hg evolve |
139
9b9500175ae5
evolve that does something \o/
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
138
diff
changeset
|
269 move:[4] another feature |
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 |
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
272 $ hg log |
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
273 7 feature-B: another feature - test |
246b8fefd0a5
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
82
diff
changeset
|
274 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
|
275 0 : base - test |
116
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
276 |
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
277 Test commit -o options |
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
278 |
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
279 $ hg up 6 |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
280 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
|
281 $ hg revert -r 7 --all |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
282 adding file-from-B |
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
283 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
|
284 $ 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
|
285 $ 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
|
286 created new head |
116
64ca29eef349
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
113
diff
changeset
|
287 $ hg log |
137
bbc653876876
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
116
diff
changeset
|
288 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
|
289 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
|
290 0 : base - test |
309
de21685d22d1
evolve: warn when latecomer changeset are created
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
302
diff
changeset
|
291 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
292 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
|
293 |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
294 $ hg phase --hidden --public 7 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
295 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
|
296 |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
297 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
|
298 |
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 $ 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
|
300 @ 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
|
301 | |
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 | o 7 : another 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
|
303 |/ |
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 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
|
305 | |
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 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
|
307 |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
308 $ hg evolve --any --traceback |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
309 recreate:[8] another feature that rox |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
310 atop:[7] another feature |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
311 computing new diff |
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
741
diff
changeset
|
312 commited as ca3b75e3e59b |
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
|
313 $ hg glog |
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
741
diff
changeset
|
314 @ 9 feature-B: bumped update to abe98aeaaa35: - 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
|
315 | |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
316 o 7 : another feature - test |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
317 | |
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
|
318 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
|
319 | |
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 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
|
321 |
625
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
322 $ hg diff --hidden -r 9 -r 8 |
469
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
323 $ hg diff -r 9^ -r 9 |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
324 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
|
325 --- a/main-file-1 |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
326 +++ b/main-file-1 |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
327 @@ -3,1 +3,1 @@ |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
328 -Zwei |
abeb17a9e313
stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
468
diff
changeset
|
329 +deux |
593
26f76b38f879
evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
561
diff
changeset
|
330 $ 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
|
331 |
705
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
332 test evolve --all |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
333 $ 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
|
334 $ hg commit -m 'dansk 2!' |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
335 $ 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
|
336 $ hg commit -m 'dansk 3!' |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
337 $ hg update 9 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
338 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
|
339 $ 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
|
340 $ hg commit --amend -m 'dansk!' |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
341 2 new unstable changesets |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
342 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
343 $ hg evolve --all --traceback |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
344 move:[10] dansk 2! |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
345 atop:[13] dansk! |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
346 merging main-file-1 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
347 move:[11] dansk 3! |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
348 atop:[14] dansk 2! |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
349 merging main-file-1 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
350 $ hg glog |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
351 @ 15 : dansk 3! - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
352 | |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
353 o 14 : dansk 2! - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
354 | |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
355 o 13 feature-B: dansk! - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
356 | |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
357 o 7 : another feature - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
358 | |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
359 o 6 feature-A: a nifty feature - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
360 | |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
361 o 0 : base - test |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
362 |
4884111bcb92
evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents:
652
diff
changeset
|
363 |
196
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
364 $ cd .. |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
365 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
366 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
|
367 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
368 $ 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
|
369 > [format] |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
370 > generaldelta=1 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
371 > EOF |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
372 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
373 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
374 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
375 $ 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
|
376 $ cd alpha |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
377 $ 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
|
378 $ 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
|
379 $ 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
|
380 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
381 $ cd .. |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
382 $ 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
|
383 adding changesets |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
384 adding manifests |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
385 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
|
386 added 1 changesets with 1 changes to 1 files |
823
9aa20585e158
exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
809
diff
changeset
|
387 OBSEXC: pull obsolescence markers |
9aa20585e158
exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
809
diff
changeset
|
388 OBSEXC: DONE |
196
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
389 $ cd alpha |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
390 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
391 $ 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
|
392 > We |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
393 > need |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
394 > some |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
395 > kind |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
396 > of |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
397 > file |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
398 > big |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
399 > enough |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
400 > to |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
401 > prevent |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
402 > snapshot |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
403 > . |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
404 > yes |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
405 > new |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
406 > lines |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
407 > are |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
408 > useless |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
409 > . |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
410 > EOF |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
411 $ 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
|
412 $ 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
|
413 $ 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
|
414 $ echo '.' >> B |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
415 $ 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
|
416 $ hg verify |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
417 checking changesets |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
418 checking manifests |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
419 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
|
420 checking files |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
421 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
|
422 $ 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
|
423 abort: empty revision set |
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
424 [255] |
e291e5271694
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
620
diff
changeset
|
425 $ hg --config extensions.hgext.mq= strip --hidden 'extinct()' |
219
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
426 saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
427 $ hg verify |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
428 checking changesets |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
429 checking manifests |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
430 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
|
431 checking files |
cfdab01ca8a0
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
196
diff
changeset
|
432 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
|
433 $ cd .. |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
434 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
435 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
|
436 |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
437 $ cd beta |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
438 $ 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
|
439 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
|
440 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
|
441 adding changesets |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
442 adding manifests |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
443 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
|
444 added 1 changesets with 1 changes to 1 files |
823
9aa20585e158
exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
809
diff
changeset
|
445 OBSEXC: pull obsolescence markers |
9aa20585e158
exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
809
diff
changeset
|
446 OBSEXC: merging obsolescence markers (171 bytes) |
9aa20585e158
exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
809
diff
changeset
|
447 OBSEXC: 2 markers added |
9aa20585e158
exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
809
diff
changeset
|
448 OBSEXC: DONE |
196
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
449 (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
|
450 $ hg up |
dea67dae27a4
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
145
diff
changeset
|
451 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
|
452 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
453 $ cd .. |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
454 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
455 Test graft --obsolete/--old-obsolete |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
456 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
457 $ hg init test-graft |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
458 $ cd test-graft |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
459 $ mkcommit 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
460 $ mkcommit 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
461 $ mkcommit 2 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
462 $ mkcommit 3 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
463 $ hg up -qC 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
464 $ mkcommit 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
465 created new head |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
466 $ glog --hidden |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
467 @ 4:ce341209337f@default(draft) add 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
468 | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
469 | o 3:0e84df4912da@default(draft) add 3 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
470 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
471 | o 2:db038628b9e5@default(draft) add 2 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
472 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
473 | o 1:73d38bb17fd7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
474 |/ |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
475 o 0:8685c6d34325@default(draft) add 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
476 |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
477 $ hg graft -r3 -O |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
478 grafting revision 3 |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
479 $ hg graft -r1 -o 2 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
480 grafting revision 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
481 $ glog --hidden |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
482 @ 6:acb28cd497b7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
483 | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
484 o 5:0b9e50c35132@default(draft) add 3 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
485 | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
486 o 4:ce341209337f@default(draft) add 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
487 | |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
488 | x 3:0e84df4912da@default(draft) add 3 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
489 | | |
419
03672e955bc8
evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents:
385
diff
changeset
|
490 | x 2:db038628b9e5@default(draft) add 2 |
418
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 1:73d38bb17fd7@default(draft) add 1 |
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 0:8685c6d34325@default(draft) add 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
495 |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
496 $ hg debugobsolete |
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
497 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 {'date': '* *', 'user': 'test'} (glob) |
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
498 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 {'date': '* *', 'user': 'test'} (glob) |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
499 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
500 Test graft --continue |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
501 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
502 $ hg up -qC 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
503 $ echo 2 > 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
504 $ hg ci -Am conflict 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
505 created new head |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
506 $ hg up -qC 6 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
507 $ hg graft -O 7 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
508 grafting revision 7 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
509 merging 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
510 warning: conflicts during merge. |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
511 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
|
512 abort: unresolved conflicts, can't continue |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
513 (use hg resolve and hg graft --continue) |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
514 [255] |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
515 $ 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
|
516 7:a5bfd90a2f29 stable |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
517 $ echo 3 > 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
518 $ hg resolve -m 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
519 $ hg graft --continue -O |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
520 grafting revision 7 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
521 $ glog --hidden |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
522 @ 8:920e58bb443b@default(draft) conflict |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
523 | |
420 | 524 | x 7:a5bfd90a2f29@default(draft) conflict |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
525 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
526 o | 6:acb28cd497b7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
527 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
528 o | 5:0b9e50c35132@default(draft) add 3 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
529 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
530 o | 4:ce341209337f@default(draft) add 4 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
531 |/ |
420 | 532 | x 3:0e84df4912da@default(draft) add 3 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
533 | | |
420 | 534 | x 2:db038628b9e5@default(draft) add 2 |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
535 | | |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
536 | o 1:73d38bb17fd7@default(draft) add 1 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
537 |/ |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
538 o 0:8685c6d34325@default(draft) add 0 |
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
539 |
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
540 $ hg debugobsolete |
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
541 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 {'date': '* *', 'user': 'test'} (glob) |
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
542 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 {'date': '* *', 'user': 'test'} (glob) |
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
420
diff
changeset
|
543 a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 {'date': '* *', 'user': 'test'} (glob) |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
544 |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
545 Test touch |
418
18a0d96ed559
evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents:
414
diff
changeset
|
546 |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
547 $ glog |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
548 @ 8:920e58bb443b@default(draft) conflict |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
549 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
550 o 6:acb28cd497b7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
551 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
552 o 5:0b9e50c35132@default(draft) add 3 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
553 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
554 o 4:ce341209337f@default(draft) add 4 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
555 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
556 | o 1:73d38bb17fd7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
557 |/ |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
558 o 0:8685c6d34325@default(draft) add 0 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
559 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
560 $ hg touch |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
561 $ glog |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
562 @ 9:*@default(draft) conflict (glob) |
481
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
563 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
564 o 6:acb28cd497b7@default(draft) add 1 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
565 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
566 o 5:0b9e50c35132@default(draft) add 3 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
567 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
568 o 4:ce341209337f@default(draft) add 4 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
569 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
570 | o 1:73d38bb17fd7@default(draft) add 1 |
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 0:8685c6d34325@default(draft) add 0 |
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 $ hg touch . |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
575 $ glog |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
576 @ 10:*@default(draft) conflict (glob) |
481
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 6:acb28cd497b7@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 5:0b9e50c35132@default(draft) add 3 |
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 o 4:ce341209337f@default(draft) add 4 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
583 | |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
584 | o 1:73d38bb17fd7@default(draft) add 1 |
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 0:8685c6d34325@default(draft) add 0 |
4e0f1aae8d24
evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
477
diff
changeset
|
587 |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
588 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
589 Test fold |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
590 |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
591 $ rm *.orig |
561
897f6da2314e
fold: handle the lack of revision to fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
553
diff
changeset
|
592 $ hg fold |
897f6da2314e
fold: handle the lack of revision to fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
553
diff
changeset
|
593 no revision to fold |
897f6da2314e
fold: handle the lack of revision to fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
553
diff
changeset
|
594 [1] |
702
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
699
diff
changeset
|
595 $ hg fold 6 --rev 10 |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
699
diff
changeset
|
596 abort: cannot specify both --rev and a target revision |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
699
diff
changeset
|
597 [255] |
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
699
diff
changeset
|
598 $ hg fold 6 # want to run hg fold 6 |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
599 2 changesets folded |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
600 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
482
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
601 $ glog |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
602 @ 11:*@default(draft) add 1 (glob) |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
603 | |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
604 o 5:0b9e50c35132@default(draft) add 3 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
605 | |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
606 o 4:ce341209337f@default(draft) add 4 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
607 | |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
608 | o 1:73d38bb17fd7@default(draft) add 1 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
609 |/ |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
610 o 0:8685c6d34325@default(draft) add 0 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
611 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
612 $ hg log -r 11 --template '{desc}\n' |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
613 add 1 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
614 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
615 |
d2531a747ff5
evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
481
diff
changeset
|
616 conflict |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
617 $ hg debugrebuildstate |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
618 $ hg st |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
619 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
620 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
|
621 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
622 $ hg up 4 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
623 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
702
b5a85a8909d3
touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
699
diff
changeset
|
624 $ hg fold --rev 4::11 |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
625 3 changesets folded |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
626 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
|
627 $ glog |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
628 @ 12:*@default(draft) add 4 (glob) |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
629 | |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
630 | o 1:73d38bb17fd7@default(draft) add 1 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
631 |/ |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
632 o 0:8685c6d34325@default(draft) add 0 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
633 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
634 $ hg log -r 12 --template '{desc}\n' |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
635 add 4 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
636 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
637 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
638 add 3 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
639 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
640 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
641 add 1 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
642 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
643 |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
644 conflict |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
645 $ hg debugrebuildstate |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
646 $ hg st |
483
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
647 |
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
648 Test olog |
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
649 |
b12ff7ef35b1
Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
482
diff
changeset
|
650 $ hg olog |
549
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
651 4 : add 4 - test |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
652 5 : add 3 - test |
b047e9417d96
Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
653 11 : add 1 - test |
807
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
654 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
655 Test obsstore stat |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
656 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
657 $ hg debugobsstorestat |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
658 markers total: 10 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
659 for known precursors: 10 |
809
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
660 with parents data: 0 |
807
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
661 markers with no successors: 0 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
662 1 successors: 10 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
663 2 successors: 0 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
664 more than 2 successors: 0 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
665 average meta length: 27 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
666 available keys: |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
667 date: 10 |
4dd1cda16fd0
evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
742
diff
changeset
|
668 user: 10 |
809
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
669 disconnected clusters: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
670 any known node: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
671 smallest length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
672 longer length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
673 median length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
674 mean length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
675 using parents data: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
676 any known node: 1 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
677 smallest length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
678 longer length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
679 median length: 10 |
5d3ddede6ccf
debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
807
diff
changeset
|
680 mean length: 10 |