##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-resolve.t: remove completely unnecessary line...
test-resolve.t: remove completely unnecessary line I have no idea what I was thinking when I wrote this.
Siddharth Agarwal - - Load All Authors

File last commit:

r26614:ef1eb6df default
r27026:c93b44b7 default
Show More
test-histedit-non-commute-abort.t
123 lines | 2.9 KiB | text/troff | Tads3Lexer
/ tests / test-histedit-non-commute-abort.t
History | Source | Raw |Copy content |Copy permalink
Mads Kiilerich
tests: convert histedit tests to .t...
 r17085 $ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH <<EOF
> [extensions]
> histedit=
> EOF
$ initrepo ()
> {
> hg init r
> cd r
> for x in a b c d e f ; do
> echo $x > $x
> hg add $x
> hg ci -m $x
> done
> echo a >> e
> hg ci -m 'does not commute with e'
> cd ..
> }
$ initrepo
$ cd r
log before edit
$ hg log --graph
@ changeset: 6:bfa474341cc9
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: does not commute with e
|
o changeset: 5:652413bf663e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: f
|
o changeset: 4:e860deea161a
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: e
|
o changeset: 3:055a42cdd887
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: d
|
o changeset: 2:177f92b77385
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: c
|
o changeset: 1:d2ae7f538514
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: b
|
o changeset: 0:cb9a9f314b8b
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: a
edit the history
Pierre-Yves David
histedit-test: generalise --commands "-" usage...
 r19019 $ hg histedit 177f92b77385 --commands - 2>&1 <<EOF | fixbundle
> pick 177f92b77385 c
> pick 055a42cdd887 d
> pick bfa474341cc9 does not commute with e
> pick e860deea161a e
> pick 652413bf663e f
> EOF
Mads Kiilerich
tests: convert histedit tests to .t...
 r17085 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
Pierre-Yves David
histedit: replaces patching logic by merges...
 r17647 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
 r26614 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Augie Fackler
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
 r18934 Fix up the change and run hg histedit --continue
Mads Kiilerich
tests: convert histedit tests to .t...
 r17085
abort the edit
$ hg histedit --abort 2>&1 | fixbundle
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
log after abort
Pierre-Yves David
histedit: replaces patching logic by merges...
 r17647 $ hg resolve -l
Mads Kiilerich
tests: convert histedit tests to .t...
 r17085 $ hg log --graph
@ changeset: 6:bfa474341cc9
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: does not commute with e
|
o changeset: 5:652413bf663e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: f
|
o changeset: 4:e860deea161a
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: e
|
o changeset: 3:055a42cdd887
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: d
|
o changeset: 2:177f92b77385
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: c
|
o changeset: 1:d2ae7f538514
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: b
|
o changeset: 0:cb9a9f314b8b
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: a
$ cd ..