Mercurial > hg > mutable-history

annotate tests/test-obsolete-rebase.t @ 302:d68ccae92d52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: make collapse create less markers Collapsing A and B into C was registering: A -> C B -> C A -> B At this point, the last relation brings nothing and is removed for the sake of simplicity: A -> C B -> C test-evolve.t is slightly modified as one of the relations let stabilize compute a target outside of the parent revision tree. This is a stabilize bug, not trivial to fix, so let's tweak the test for now.
author Patrick Mezard <patrick@mezard.eu>
date Sat, 23 Jun 2012 11:14:09 +0200
parents f597421662f7
children 5eecfda0a5c7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
1 $ cat >> $HGRCPATH <<EOF
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
2 > [defaults]
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
3 > amend=-d "0 0"
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
4 > [extensions]
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
5 > hgext.rebase=
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
6 > hgext.graphlog=
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
7 > EOF
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
8 $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
9
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
10 $ glog() {
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
11 > hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n'\
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
12 > "$@"
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
13 > }
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
14
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
15 $ hg init repo
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
16 $ cd repo
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
17 $ echo a > a
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
18 $ hg ci -Am adda
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
19 adding a
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
20 $ echo a >> a
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
21 $ hg ci -m changea
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
22
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
23 Test regular rebase
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
24
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
25 $ hg up 0
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
27 $ echo b > b
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
28 $ hg ci -Am addb
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
29 adding b
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
30 created new head
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
31 $ echo e > e
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
32 $ hg ci -Am adde e
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
33 $ hg rebase -d 1 -r . --detach --keep
280
fd43e3908f09 test-obsolete-rebase.t: move --keep test from test-obsolete.t
Patrick Mezard <patrick@mezard.eu>
parents: 279
diff changeset
34 abort: rebase --keep option is unsupported with obsolete extension
fd43e3908f09 test-obsolete-rebase.t: move --keep test from test-obsolete.t
Patrick Mezard <patrick@mezard.eu>
parents: 279
diff changeset
35 (see 'hg help obsolete')
fd43e3908f09 test-obsolete-rebase.t: move --keep test from test-obsolete.t
Patrick Mezard <patrick@mezard.eu>
parents: 279
diff changeset
36 [255]
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
37 $ hg rebase -d 1 -r . --detach
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
38 $ glog --hidden
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
39 @ 4:9c5494949763@default(draft) adde
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
40 |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
41 | o 3:98e4a024635e@default(secret) adde
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
42 | |
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
43 | o 2:102a90ea7b4a@default(draft) addb
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
44 | |
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
45 o | 1:540395c44225@default(draft) changea
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
46 |/
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
47 o 0:07f494440405@default(draft) adda
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
48
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
49 $ hg debugsuccessors
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
50 98e4a024635e 9c5494949763
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
51
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
52 Test rebase with deleted empty revision
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
53
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
54 $ hg up 0
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
55 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
56 $ hg branch foo
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
57 marked working directory as branch foo
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
58 (branches are permanent and global, did you want a bookmark?)
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
59 $ echo a >> a
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
60 $ hg ci -m changea
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
61 $ hg rebase -d 1
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
62 $ glog --hidden
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
63 o 5:4e322f7ce8e3@foo(secret) changea
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
64 |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
65 | o 4:9c5494949763@default(draft) adde
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
66 | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
67 | | o 3:98e4a024635e@default(secret) adde
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
68 | | |
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
69 +---o 2:102a90ea7b4a@default(draft) addb
279
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
70 | |
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
71 | @ 1:540395c44225@default(draft) changea
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
72 |/
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
73 o 0:07f494440405@default(draft) adda
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
74
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
75 $ hg debugsuccessors
0d87b1fbf32b obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
76 4e322f7ce8e3 000000000000
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
77 98e4a024635e 9c5494949763
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
78
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
79 Test rebase --collapse
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
80
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
81 $ hg up 0
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
83 $ echo c > c
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
84 $ hg ci -Am addc
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
85 adding c
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
86 created new head
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
87 $ echo c >> c
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
88 $ hg ci -m changec
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
89 $ hg rebase --collapse -d 1
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
90 merging c
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
91 $ glog --hidden
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
92 @ 8:a7773ffa7edc@default(draft) Collapsed revision
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
93 |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
94 | o 7:03f31481307a@default(secret) changec
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
95 | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
96 | o 6:076e9b2ffbe1@default(secret) addc
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
97 | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
98 | | o 5:4e322f7ce8e3@foo(secret) changea
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
99 | |/
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
100 +---o 4:9c5494949763@default(draft) adde
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
101 | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
102 | | o 3:98e4a024635e@default(secret) adde
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
103 | | |
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
104 | | o 2:102a90ea7b4a@default(draft) addb
282
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
105 | |/
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
106 o | 1:540395c44225@default(draft) changea
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
107 |/
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
108 o 0:07f494440405@default(draft) adda
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
109
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
110 $ hg debugsuccessors
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
111 03f31481307a a7773ffa7edc
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
112 076e9b2ffbe1 a7773ffa7edc
05ab164c6593 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
113 4e322f7ce8e3 000000000000
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
114 98e4a024635e 9c5494949763
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
115
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
116 Test rebase --abort
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
117
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
118 $ hg debugsuccessors > ../successors.old
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
119 $ hg up 0
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
120 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
121 $ echo d > d
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
122 $ hg ci -Am addd d
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
123 created new head
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
124 $ echo b >> a
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
125 $ hg ci -m appendab
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
126 $ hg rebase -d 1
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
127 merging a
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
128 warning: conflicts during merge.
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
129 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
130 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
131 [255]
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
132 $ hg rebase --abort
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
133 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/03f165c84ea8-backup.hg
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
134 rebase aborted
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
135 $ hg debugsuccessors > ../successors.new
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
136 $ diff -u ../successors.old ../successors.new
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
137
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
138 Test rebase --continue
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
139
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
140 $ hg rebase -d 1
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
141 merging a
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
142 warning: conflicts during merge.
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
143 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
144 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
145 [255]
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
146 $ hg resolve --tool internal:other a
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
147 $ hg rebase --continue
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
148 $ glog --hidden
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
149 @ 12:1951ead97108@default(draft) appendab
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
150 |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
151 o 11:03f165c84ea8@default(draft) addd
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
152 |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
153 | o 10:4b9d80f48523@default(secret) appendab
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
154 | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
155 | o 9:a31943eabc43@default(secret) addd
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
156 | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
157 +---o 8:a7773ffa7edc@default(draft) Collapsed revision
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
158 | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
159 | | o 7:03f31481307a@default(secret) changec
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
160 | | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
161 | | o 6:076e9b2ffbe1@default(secret) addc
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
162 | |/
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
163 | | o 5:4e322f7ce8e3@foo(secret) changea
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
164 | |/
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
165 +---o 4:9c5494949763@default(draft) adde
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
166 | |
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
167 | | o 3:98e4a024635e@default(secret) adde
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
168 | | |
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
169 | | o 2:102a90ea7b4a@default(draft) addb
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
170 | |/
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
171 o | 1:540395c44225@default(draft) changea
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
172 |/
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
173 o 0:07f494440405@default(draft) adda
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
174
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
175 $ hg debugsuccessors > ../successors.new
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
176 $ diff -u ../successors.old ../successors.new
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
177 --- ../successors.old* (glob)
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
178 +++ ../successors.new* (glob)
302
d68ccae92d52 obsolete: make collapse create less markers
Patrick Mezard <patrick@mezard.eu>
parents: 298
diff changeset
179 @@ -1,4 +1,6 @@
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
180 03f31481307a a7773ffa7edc
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
181 076e9b2ffbe1 a7773ffa7edc
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
182 +4b9d80f48523 1951ead97108
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
183 4e322f7ce8e3 000000000000
285
691cb55358b0 obsolete: do not obsolete rebase --detach nullmerge revs
Patrick Mezard <patrick@mezard.eu>
parents: 283
diff changeset
184 98e4a024635e 9c5494949763
283
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
185 +a31943eabc43 03f165c84ea8
8d1a8eeb5a84 test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu>
parents: 282
diff changeset
186 [1]