Mercurial > hg
view tests/test-absorb-edit-lines.t @ 46284:d7f763c8c58e
shelve: make gennames() helper generate relative backup paths
When I saw `gennames()`, I thought it was meant to take a relative
filename as argument. Maybe it was or maybe it wasn't, but it seems
simpler to pass it a relative path anyway, so that's what this patch
does. That also makes the call to backupvfs.exists() more natural (I
expect a relative path to be passed there too).
Differential Revision: https://phab.mercurial-scm.org/D9711
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 07 Jan 2021 23:09:04 -0800 |
parents | 31dfa7dac4c9 |
children | 3cd57e2be49b |
line wrap: on
line source
$ 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: $ hg absorb --edit-lines --apply-changes nothing applied [1] $ HGEDITOR=cat hg absorb --edit-lines --apply-changes a 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 $ HGEDITOR='cat editortext >' hg absorb -q --edit-lines --apply-changes a $ 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