##// END OF EJS Templates
py3: fix test-dirstate-race.t...
py3: fix test-dirstate-race.t Differential Revision: https://phab.mercurial-scm.org/D5106

File last commit:

r40226:31dfa7da default
r40332:e787d97e default
Show More
test-absorb-edit-lines.t
61 lines | 1.0 KiB | text/troff | Tads3Lexer
/ tests / test-absorb-edit-lines.t
Augie Fackler
absorb: import extension from Facebook's hg-experimental...
r38953 $ cat >> $HGRCPATH << EOF
> [extensions]
> absorb=
> EOF
$ hg init repo1
$ cd repo1
Make some commits:
$ for i in 1 2 3; do
> echo $i >> a
> hg commit -A a -m "commit $i" -q
> done
absorb --edit-lines will run the editor if filename is provided:
Mark Thomas
absorb: prompt user to accept absorb changes by default...
r40226 $ hg absorb --edit-lines --apply-changes
Augie Fackler
absorb: import extension from Facebook's hg-experimental...
r38953 nothing applied
[1]
Mark Thomas
absorb: prompt user to accept absorb changes by default...
r40226 $ HGEDITOR=cat hg absorb --edit-lines --apply-changes a
Augie Fackler
absorb: import extension from Facebook's hg-experimental...
r38953 HG: editing a
HG: "y" means the line to the right exists in the changeset to the top
HG:
HG: /---- 4ec16f85269a commit 1
HG: |/--- 5c5f95224a50 commit 2
HG: ||/-- 43f0a75bede7 commit 3
HG: |||
yyy : 1
yy : 2
y : 3
nothing applied
[1]
Edit the file using --edit-lines:
$ cat > editortext << EOF
> y : a
> yy : b
> y : c
> yy : d
> y y : e
> y : f
> yyy : g
> EOF
Mark Thomas
absorb: prompt user to accept absorb changes by default...
r40226 $ HGEDITOR='cat editortext >' hg absorb -q --edit-lines --apply-changes a
Augie Fackler
absorb: import extension from Facebook's hg-experimental...
r38953 $ hg cat -r 0 a
d
e
f
g
$ hg cat -r 1 a
b
c
d
g
$ hg cat -r 2 a
a
b
e
g