71 |
71 |
72 |
72 |
73 edit the history |
73 edit the history |
74 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
74 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
75 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
75 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
76 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
76 remote changed e which local deleted |
|
77 use (c)hanged version or leave (d)eleted? c |
|
78 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
79 merging e |
|
80 warning: conflicts during merge. |
|
81 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
77 abort: Fix up the change and run hg histedit --continue |
82 abort: Fix up the change and run hg histedit --continue |
78 |
83 |
79 fix up (pre abort) |
|
80 $ echo a > e |
|
81 $ hg add e |
|
82 $ hg histedit --continue 2>&1 | fixbundle |
|
83 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
84 file e already exists |
|
85 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
|
86 abort: Fix up the change and run hg histedit --continue |
|
87 |
84 |
88 abort the edit |
85 abort the edit |
89 $ hg histedit --abort 2>&1 | fixbundle |
86 $ hg histedit --abort 2>&1 | fixbundle |
90 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
87 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
91 |
88 |
92 log after abort |
89 log after abort |
|
90 $ hg resolve -l |
93 $ hg log --graph |
91 $ hg log --graph |
94 @ changeset: 6:bfa474341cc9 |
92 @ changeset: 6:bfa474341cc9 |
95 | tag: tip |
93 | tag: tip |
96 | user: test |
94 | user: test |
97 | date: Thu Jan 01 00:00:00 1970 +0000 |
95 | date: Thu Jan 01 00:00:00 1970 +0000 |