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

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

largefiles: unlink standins not known to the restored dirstate at rollback...
largefiles: unlink standins not known to the restored dirstate at rollback Before this patch, standinds not known to the restored dirstate at rollback still exist after rollback of the parent of the working directory, and they become orphans unexpectedly. This patch unlinks standins not known to the restored dirstate. This patch saves names of standins matched against not "repo.dirstate[f] == 'a'" but "repo.dirstate[f] != 'r'" before rollback, because branch merging marks files newly added to dirstate as not "a" but "n". Such standins will also become orphan after rollback, because they are not known to the restored dirstate.
Martin Geisler - - Load All Authors

File last commit:

r20117:aa9385f9 default
r22286:3f3b9483 default
Show More
test-histedit-drop.t
155 lines | 3.7 KiB | text/troff | Tads3Lexer
/ tests / test-histedit-drop.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
> }
$ initrepo
log before edit
$ hg log --graph
@ changeset: 5:652413bf663e
| tag: tip
| 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
> drop 177f92b77385 c
> pick e860deea161a e
> pick 652413bf663e f
> pick 055a42cdd887 d
> EOF
Mads Kiilerich
tests: convert histedit tests to .t...
 r17085 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
log after edit
$ hg log --graph
Pierre-Yves David
histedit: record histedit source (issue3681)...
 r18437 @ changeset: 4:f518305ce889
Mads Kiilerich
tests: convert histedit tests to .t...
 r17085 | tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: d
|
Pierre-Yves David
histedit: record histedit source (issue3681)...
 r18437 o changeset: 3:a4f7421b80f7
Mads Kiilerich
tests: convert histedit tests to .t...
 r17085 | user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: f
|
Pierre-Yves David
histedit: record histedit source (issue3681)...
 r18437 o changeset: 2:ee283cb5f2d5
Mads Kiilerich
tests: convert histedit tests to .t...
 r17085 | user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: e
|
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
Pierre-Yves David
histedit: record histedit source (issue3681)...
 r18437 Check histedit_source
$ hg log --debug --rev f518305ce889
Siddharth Agarwal
histedit: hold wlock and lock while in progress...
 r20071 invalid branchheads cache (visible): tip differs
Pierre-Yves David
histedit: record histedit source (issue3681)...
 r18437 changeset: 4:f518305ce889c07cb5bd05522176d75590ef3324
tag: tip
phase: draft
parent: 3:a4f7421b80f79fcc59fff01bcbf4a53d127dd6d3
parent: -1:0000000000000000000000000000000000000000
manifest: 4:d3d4f51c157ff242c32ff745d4799aaa26ccda44
user: test
date: Thu Jan 01 00:00:00 1970 +0000
files+: d
extra: branch=default
extra: histedit_source=055a42cdd88768532f9cf79daa407fc8d138de9b
description:
d
Mads Kiilerich
tests: convert histedit tests to .t...
 r17085 manifest after edit
$ hg manifest
a
b
d
e
f
Pierre-Yves David
test-histedit: add tests for dropping head changeset...
 r18509 Drop the last changeset
Pierre-Yves David
histedit-test: generalise --commands "-" usage...
 r19019 $ hg histedit ee283cb5f2d5 --commands - 2>&1 << EOF | fixbundle
Pierre-Yves David
test-histedit: add tests for dropping head changeset...
 r18509 > pick ee283cb5f2d5 e
> pick a4f7421b80f7 f
> drop f518305ce889 d
> EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log --graph
@ changeset: 3:a4f7421b80f7
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: f
|
o changeset: 2:ee283cb5f2d5
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: e
|
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
Mads Kiilerich
tests: convert histedit tests to .t...
 r17085 $ cd ..