Mercurial > hg
annotate tests/test-histedit-non-commute.t @ 24497:2e0301ac5c91
test-diffstat: add a glob the test runner wants on Windows
The test gets a '~' status without it.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 28 Mar 2015 23:57:16 -0400 |
parents | b081decd9062 |
children | 477e76936b1d |
rev | line source |
---|---|
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
1 $ . "$TESTDIR/histedit-helpers.sh" |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
2 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
3 $ cat >> $HGRCPATH <<EOF |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
4 > [extensions] |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
5 > histedit= |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
6 > EOF |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
7 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
8 $ initrepo () |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
9 > { |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
10 > hg init $1 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
11 > cd $1 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
12 > for x in a b c d e f ; do |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
13 > echo $x$x$x$x$x > $x |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
14 > hg add $x |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
15 > done |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
16 > hg ci -m 'Initial commit' |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
17 > for x in a b c d e f ; do |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
18 > echo $x > $x |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
19 > hg ci -m $x |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
20 > done |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
21 > echo 'I can haz no commute' > e |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
22 > hg ci -m 'does not commute with e' |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
23 > cd .. |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
24 > } |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
25 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
26 $ initrepo r1 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
27 $ cd r1 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
28 |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
29 Initial generation of the command files |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
30 |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
31 $ EDITED="$TESTTMP/editedhistory" |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
32 $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 3 >> $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
33 $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 4 >> $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
34 $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 7 >> $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
35 $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 5 >> $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
36 $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 6 >> $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
37 $ cat $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
38 pick 65a9a84f33fd 3 c |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
39 pick 00f1c5383965 4 d |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
40 pick 39522b764e3d 7 does not commute with e |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
41 pick 7b4e2f4b7bcd 5 e |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
42 pick 500cac37a696 6 f |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
43 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
44 log before edit |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
45 $ hg log --graph |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
46 @ changeset: 7:39522b764e3d |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
47 | tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
48 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
49 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
50 | summary: does not commute with e |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
51 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
52 o changeset: 6:500cac37a696 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
53 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
54 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
55 | summary: f |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
56 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
57 o changeset: 5:7b4e2f4b7bcd |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
58 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
59 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
60 | summary: e |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
61 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
62 o changeset: 4:00f1c5383965 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
63 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
64 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
65 | summary: d |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
66 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
67 o changeset: 3:65a9a84f33fd |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
68 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
69 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
70 | summary: c |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
71 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
72 o changeset: 2:da6535b52e45 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
73 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
74 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
75 | summary: b |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
76 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
77 o changeset: 1:c1f09da44841 |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
78 | user: test |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
79 | date: Thu Jan 01 00:00:00 1970 +0000 |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
80 | summary: a |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
81 | |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
82 o changeset: 0:1715188a53c7 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
83 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
84 date: Thu Jan 01 00:00:00 1970 +0000 |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
85 summary: Initial commit |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
86 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
87 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
88 edit the history |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18934
diff
changeset
|
89 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
90 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17647
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
91 merging e |
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
92 warning: conflicts during merge. |
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
93 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18437
diff
changeset
|
94 Fix up the change and run hg histedit --continue |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
95 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
96 abort the edit |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
97 $ hg histedit --abort 2>&1 | fixbundle |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
98 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
99 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
100 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
101 second edit set |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
102 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
103 $ hg log --graph |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
104 @ changeset: 7:39522b764e3d |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
105 | tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
106 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
107 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
108 | summary: does not commute with e |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
109 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
110 o changeset: 6:500cac37a696 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
111 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
112 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
113 | summary: f |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
114 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
115 o changeset: 5:7b4e2f4b7bcd |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
116 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
117 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
118 | summary: e |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
119 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
120 o changeset: 4:00f1c5383965 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
121 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
122 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
123 | summary: d |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
124 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
125 o changeset: 3:65a9a84f33fd |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
126 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
127 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
128 | summary: c |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
129 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
130 o changeset: 2:da6535b52e45 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
131 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
132 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
133 | summary: b |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
134 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
135 o changeset: 1:c1f09da44841 |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
136 | user: test |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
137 | date: Thu Jan 01 00:00:00 1970 +0000 |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
138 | summary: a |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
139 | |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
140 o changeset: 0:1715188a53c7 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
141 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
142 date: Thu Jan 01 00:00:00 1970 +0000 |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
143 summary: Initial commit |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
144 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
145 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
146 edit the history |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18934
diff
changeset
|
147 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
148 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17647
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
149 merging e |
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
150 warning: conflicts during merge. |
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
151 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18437
diff
changeset
|
152 Fix up the change and run hg histedit --continue |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
153 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
154 fix up |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
155 $ echo 'I can haz no commute' > e |
17647
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
156 $ hg resolve --mark e |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
157 (no more unresolved files) |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
158 $ hg histedit --continue 2>&1 | fixbundle |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
159 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17647
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
160 merging e |
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
161 warning: conflicts during merge. |
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
162 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18437
diff
changeset
|
163 Fix up the change and run hg histedit --continue |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
164 |
17688
f4bed9b57858
histedit-test: clarify the reason of a failure
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17647
diff
changeset
|
165 This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative |
f4bed9b57858
histedit-test: clarify the reason of a failure
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17647
diff
changeset
|
166 former children. |
f4bed9b57858
histedit-test: clarify the reason of a failure
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17647
diff
changeset
|
167 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
168 just continue this time |
17647
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
169 $ hg revert -r 'p1()' e |
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
170 $ hg resolve --mark e |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
171 (no more unresolved files) |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
172 $ hg histedit --continue 2>&1 | fixbundle |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
173 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
174 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
175 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
176 log after edit |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
177 $ hg log --graph |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17688
diff
changeset
|
178 @ changeset: 6:7efe1373e4bc |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
179 | tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
180 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
181 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
182 | summary: f |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
183 | |
18437
358c23e8f1c6
histedit: record histedit source (issue3681)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17688
diff
changeset
|
184 o changeset: 5:e334d87a1e55 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
185 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
186 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
187 | summary: does not commute with e |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
188 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
189 o changeset: 4:00f1c5383965 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
190 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
191 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
192 | summary: d |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
193 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
194 o changeset: 3:65a9a84f33fd |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
195 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
196 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
197 | summary: c |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
198 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
199 o changeset: 2:da6535b52e45 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
200 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
201 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
202 | summary: b |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
203 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
204 o changeset: 1:c1f09da44841 |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
205 | user: test |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
206 | date: Thu Jan 01 00:00:00 1970 +0000 |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
207 | summary: a |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
208 | |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
209 o changeset: 0:1715188a53c7 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
210 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
211 date: Thu Jan 01 00:00:00 1970 +0000 |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
212 summary: Initial commit |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
213 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
214 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
215 start over |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
216 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
217 $ cd .. |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
218 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
219 $ initrepo r2 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
220 $ cd r2 |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
221 $ rm $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
222 $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 3 >> $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
223 $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 4 >> $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
224 $ hg log --template 'mess {node|short} {rev} {desc}\n' -r 7 >> $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
225 $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 5 >> $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
226 $ hg log --template 'pick {node|short} {rev} {desc}\n' -r 6 >> $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
227 $ cat $EDITED |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
228 pick 65a9a84f33fd 3 c |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
229 pick 00f1c5383965 4 d |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
230 mess 39522b764e3d 7 does not commute with e |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
231 pick 7b4e2f4b7bcd 5 e |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
232 pick 500cac37a696 6 f |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
233 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
234 edit the history, this time with a fold action |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18934
diff
changeset
|
235 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
236 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17647
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
237 merging e |
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
238 warning: conflicts during merge. |
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
239 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18437
diff
changeset
|
240 Fix up the change and run hg histedit --continue |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
241 |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
242 $ echo 'I can haz no commute' > e |
17647
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
243 $ hg resolve --mark e |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
244 (no more unresolved files) |
19020
12c06686d371
histedit: move all arguments checks to the beginning of the command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
19019
diff
changeset
|
245 $ hg histedit --continue 2>&1 | fixbundle |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
246 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17647
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
247 merging e |
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
248 warning: conflicts during merge. |
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
249 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
18934
93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18437
diff
changeset
|
250 Fix up the change and run hg histedit --continue |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
251 second edit also fails, but just continue |
17647
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
252 $ hg revert -r 'p1()' e |
d34ba4991188
histedit: replaces patching logic by merges
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17646
diff
changeset
|
253 $ hg resolve --mark e |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
254 (no more unresolved files) |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
255 $ hg histedit --continue 2>&1 | fixbundle |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
256 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
257 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
258 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
259 post message fix |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
260 $ hg log --graph |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18934
diff
changeset
|
261 @ changeset: 6:7efe1373e4bc |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
262 | tag: tip |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
263 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
264 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
265 | summary: f |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
266 | |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18934
diff
changeset
|
267 o changeset: 5:e334d87a1e55 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
268 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
269 | date: Thu Jan 01 00:00:00 1970 +0000 |
19019
53060cc1b601
histedit-test: generalise --commands "-" usage
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18934
diff
changeset
|
270 | summary: does not commute with e |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
271 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
272 o changeset: 4:00f1c5383965 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
273 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
274 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
275 | summary: d |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
276 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
277 o changeset: 3:65a9a84f33fd |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
278 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
279 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
280 | summary: c |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
281 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
282 o changeset: 2:da6535b52e45 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
283 | user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
284 | date: Thu Jan 01 00:00:00 1970 +0000 |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
285 | summary: b |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
286 | |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
287 o changeset: 1:c1f09da44841 |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
288 | user: test |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
289 | date: Thu Jan 01 00:00:00 1970 +0000 |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
290 | summary: a |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
291 | |
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
292 o changeset: 0:1715188a53c7 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
293 user: test |
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
294 date: Thu Jan 01 00:00:00 1970 +0000 |
17646
d44731a3adb8
histedit-test: ensure that non commute test will never commute
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17087
diff
changeset
|
295 summary: Initial commit |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
296 |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
297 |
17085
35729bdd59b6
tests: convert histedit tests to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
17064
diff
changeset
|
298 $ cd .. |