test-mq-subrepo.t
616 lines
| 15.0 KiB
| text/troff
|
Tads3Lexer
/ tests / test-mq-subrepo.t
|
r23172 | $ cat <<EOF >> $HGRCPATH | ||
> [ui] | ||||
> commitsubrepos = Yes | ||||
> [extensions] | ||||
> mq = | ||||
> record = | ||||
> [diff] | ||||
> nodates = 1 | ||||
> EOF | ||||
|
r13174 | |||
|
r13241 | $ stdin=`pwd`/stdin.tmp | ||
|
r13174 | fn to create new repository w/dirty subrepo, and cd into it | ||
$ mkrepo() { | ||||
> hg init $1 | ||||
> cd $1 | ||||
> hg qinit | ||||
> } | ||||
fn to create dirty subrepo | ||||
$ mksubrepo() { | ||||
> hg init $1 | ||||
> cd $1 | ||||
> echo a > a | ||||
> hg add | ||||
> cd .. | ||||
> } | ||||
$ testadd() { | ||||
|
r13241 | > cat - > "$stdin" | ||
|
r13174 | > mksubrepo sub | ||
> echo sub = sub >> .hgsub | ||||
> hg add .hgsub | ||||
> echo % abort when adding .hgsub w/dirty subrepo | ||||
> hg status -S | ||||
> echo '%' $* | ||||
|
r13241 | > cat "$stdin" | hg $* | ||
|
r13174 | > echo [$?] | ||
> hg -R sub ci -m0sub | ||||
> echo % update substate when adding .hgsub w/clean updated subrepo | ||||
> hg status -S | ||||
> echo '%' $* | ||||
|
r13241 | > cat "$stdin" | hg $* | ||
|
r13174 | > hg debugsub | ||
> } | ||||
$ testmod() { | ||||
|
r13241 | > cat - > "$stdin" | ||
|
r13174 | > mksubrepo sub2 | ||
> echo sub2 = sub2 >> .hgsub | ||||
> echo % abort when modifying .hgsub w/dirty subrepo | ||||
> hg status -S | ||||
> echo '%' $* | ||||
|
r13241 | > cat "$stdin" | hg $* | ||
|
r13174 | > echo [$?] | ||
> hg -R sub2 ci -m0sub2 | ||||
> echo % update substate when modifying .hgsub w/clean updated subrepo | ||||
> hg status -S | ||||
> echo '%' $* | ||||
|
r13241 | > cat "$stdin" | hg $* | ||
|
r13174 | > hg debugsub | ||
> } | ||||
$ testrm1() { | ||||
|
r13241 | > cat - > "$stdin" | ||
|
r13174 | > mksubrepo sub3 | ||
> echo sub3 = sub3 >> .hgsub | ||||
> hg ci -Aqmsub3 | ||||
> $EXTRA | ||||
> echo b >> sub3/a | ||||
> hg rm .hgsub | ||||
> echo % update substate when removing .hgsub w/dirty subrepo | ||||
> hg status -S | ||||
> echo '%' $* | ||||
|
r13241 | > cat "$stdin" | hg $* | ||
|
r13174 | > echo % debugsub should be empty | ||
> hg debugsub | ||||
> } | ||||
|
r13241 | |||
|
r13174 | $ testrm2() { | ||
|
r13241 | > cat - > "$stdin" | ||
|
r13174 | > mksubrepo sub4 | ||
> echo sub4 = sub4 >> .hgsub | ||||
> hg ci -Aqmsub4 | ||||
> $EXTRA | ||||
> hg rm .hgsub | ||||
> echo % update substate when removing .hgsub w/clean updated subrepo | ||||
> hg status -S | ||||
> echo '%' $* | ||||
|
r13241 | > cat "$stdin" | hg $* | ||
|
r13174 | > echo % debugsub should be empty | ||
> hg debugsub | ||||
> } | ||||
handle subrepos safely on qnew | ||||
$ mkrepo repo-2499-qnew | ||||
|
r20785 | $ testadd qnew -X path:no-effect -m0 0.diff | ||
|
r13174 | adding a | ||
% abort when adding .hgsub w/dirty subrepo | ||||
A .hgsub | ||||
A sub/a | ||||
|
r20785 | % qnew -X path:no-effect -m0 0.diff | ||
|
r33365 | abort: uncommitted changes in subrepository "sub" | ||
|
r13174 | [255] | ||
% update substate when adding .hgsub w/clean updated subrepo | ||||
A .hgsub | ||||
|
r25418 | A sub/a | ||
|
r20785 | % qnew -X path:no-effect -m0 0.diff | ||
|
r13174 | path sub | ||
source sub | ||||
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 | ||||
|
r20785 | $ testmod qnew --cwd .. -R repo-2499-qnew -X path:no-effect -m1 1.diff | ||
|
r13174 | adding a | ||
% abort when modifying .hgsub w/dirty subrepo | ||||
M .hgsub | ||||
A sub2/a | ||||
|
r20785 | % qnew --cwd .. -R repo-2499-qnew -X path:no-effect -m1 1.diff | ||
|
r33365 | abort: uncommitted changes in subrepository "sub2" | ||
|
r13174 | [255] | ||
% update substate when modifying .hgsub w/clean updated subrepo | ||||
M .hgsub | ||||
|
r25418 | A sub2/a | ||
|
r20785 | % qnew --cwd .. -R repo-2499-qnew -X path:no-effect -m1 1.diff | ||
|
r13174 | path sub | ||
source sub | ||||
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 | ||||
path sub2 | ||||
source sub2 | ||||
revision 1f94c7611cc6b74f5a17b16121a1170d44776845 | ||||
$ hg qpop -qa | ||||
patch queue now empty | ||||
$ testrm1 qnew -m2 2.diff | ||||
adding a | ||||
% update substate when removing .hgsub w/dirty subrepo | ||||
M sub3/a | ||||
R .hgsub | ||||
% qnew -m2 2.diff | ||||
% debugsub should be empty | ||||
$ hg qpop -qa | ||||
patch queue now empty | ||||
$ testrm2 qnew -m3 3.diff | ||||
adding a | ||||
% update substate when removing .hgsub w/clean updated subrepo | ||||
R .hgsub | ||||
% qnew -m3 3.diff | ||||
% debugsub should be empty | ||||
$ cd .. | ||||
handle subrepos safely on qrefresh | ||||
$ mkrepo repo-2499-qrefresh | ||||
$ hg qnew -m0 0.diff | ||||
$ testadd qrefresh | ||||
adding a | ||||
% abort when adding .hgsub w/dirty subrepo | ||||
A .hgsub | ||||
A sub/a | ||||
% qrefresh | ||||
|
r33365 | abort: uncommitted changes in subrepository "sub" | ||
|
r13174 | [255] | ||
% update substate when adding .hgsub w/clean updated subrepo | ||||
A .hgsub | ||||
|
r25418 | A sub/a | ||
|
r13174 | % qrefresh | ||
path sub | ||||
source sub | ||||
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 | ||||
$ hg qnew -m1 1.diff | ||||
$ testmod qrefresh | ||||
adding a | ||||
% abort when modifying .hgsub w/dirty subrepo | ||||
M .hgsub | ||||
A sub2/a | ||||
% qrefresh | ||||
|
r33365 | abort: uncommitted changes in subrepository "sub2" | ||
|
r13174 | [255] | ||
% update substate when modifying .hgsub w/clean updated subrepo | ||||
M .hgsub | ||||
|
r25418 | A sub2/a | ||
|
r13174 | % qrefresh | ||
path sub | ||||
source sub | ||||
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 | ||||
path sub2 | ||||
source sub2 | ||||
revision 1f94c7611cc6b74f5a17b16121a1170d44776845 | ||||
$ hg qpop -qa | ||||
patch queue now empty | ||||
|
r13510 | $ EXTRA='hg qnew -m2 2.diff' | ||
$ testrm1 qrefresh | ||||
|
r13174 | adding a | ||
% update substate when removing .hgsub w/dirty subrepo | ||||
M sub3/a | ||||
R .hgsub | ||||
% qrefresh | ||||
% debugsub should be empty | ||||
$ hg qpop -qa | ||||
patch queue now empty | ||||
|
r13510 | $ EXTRA='hg qnew -m3 3.diff' | ||
$ testrm2 qrefresh | ||||
|
r13174 | adding a | ||
% update substate when removing .hgsub w/clean updated subrepo | ||||
R .hgsub | ||||
% qrefresh | ||||
% debugsub should be empty | ||||
|
r13510 | $ EXTRA= | ||
|
r13174 | |||
$ cd .. | ||||
handle subrepos safely on qpush/qpop | ||||
|
r19636 | (and we cannot qpop / qpush with a modified subrepo) | ||
|
r13174 | |||
$ mkrepo repo-2499-qpush | ||||
$ mksubrepo sub | ||||
adding a | ||||
$ hg -R sub ci -m0sub | ||||
$ echo sub = sub > .hgsub | ||||
$ hg add .hgsub | ||||
|
r19636 | $ hg commit -m0 | ||
$ hg debugsub | ||||
path sub | ||||
source sub | ||||
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 | ||||
$ echo foo > ./sub/a | ||||
$ hg -R sub commit -m foo | ||||
$ hg commit -m1 | ||||
$ hg qimport -r "0:tip" | ||||
|
r19638 | $ hg -R sub id --id | ||
aa037b301eba | ||||
|
r19636 | |||
qpop | ||||
$ hg -R sub update 0000 | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg qpop | ||||
|
r26780 | abort: local changed subrepos found, qrefresh first | ||
|
r19636 | [255] | ||
$ hg revert sub | ||||
reverting subrepo sub | ||||
|
r35394 | adding sub/a | ||
|
r19636 | $ hg qpop | ||
|
r26736 | popping 1 | ||
now at: 0 | ||||
|
r19636 | $ hg status -AS | ||
C .hgsub | ||||
C .hgsubstate | ||||
|
r19638 | C sub/a | ||
$ hg -R sub id --id | ||||
b2fdb12cd82b | ||||
|
r13174 | |||
|
r19636 | qpush | ||
$ hg -R sub update 0000 | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg qpush | ||||
|
r26780 | abort: local changed subrepos found, qrefresh first | ||
|
r19636 | [255] | ||
$ hg revert sub | ||||
reverting subrepo sub | ||||
|
r35394 | adding sub/a | ||
|
r19636 | $ hg qpush | ||
|
r26736 | applying 1 | ||
|
r19811 | subrepository sub diverged (local revision: b2fdb12cd82b, remote revision: aa037b301eba) | ||
|
r42791 | you can (m)erge, keep (l)ocal or keep (r)emote. | ||
what do you want to do? m | ||||
|
r19638 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r26736 | now at: 1 | ||
|
r13174 | $ hg status -AS | ||
C .hgsub | ||||
|
r19638 | C .hgsubstate | ||
|
r13174 | C sub/a | ||
|
r19638 | $ hg -R sub id --id | ||
aa037b301eba | ||||
|
r13174 | |||
$ cd .. | ||||
handle subrepos safely on qrecord | ||||
$ mkrepo repo-2499-qrecord | ||||
$ testadd qrecord --config ui.interactive=1 -m0 0.diff <<EOF | ||||
> y | ||||
> y | ||||
> EOF | ||||
adding a | ||||
% abort when adding .hgsub w/dirty subrepo | ||||
A .hgsub | ||||
A sub/a | ||||
% qrecord --config ui.interactive=1 -m0 0.diff | ||||
|
r33365 | abort: uncommitted changes in subrepository "sub" | ||
|
r13174 | [255] | ||
% update substate when adding .hgsub w/clean updated subrepo | ||||
A .hgsub | ||||
|
r25418 | A sub/a | ||
|
r13174 | % qrecord --config ui.interactive=1 -m0 0.diff | ||
diff --git a/.hgsub b/.hgsub | ||||
new file mode 100644 | ||||
|
r42766 | examine changes to '.hgsub'? | ||
(enter ? for help) [Ynesfdaq?] y | ||||
|
r22589 | |||
|
r24845 | @@ -0,0 +1,1 @@ | ||
+sub = sub | ||||
|
r42766 | record this change to '.hgsub'? | ||
(enter ? for help) [Ynesfdaq?] y | ||||
|
r24845 | |||
warning: subrepo spec file '.hgsub' not found | ||||
|
r30200 | warning: subrepo spec file '.hgsub' not found | ||
|
r13174 | path sub | ||
source sub | ||||
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 | ||||
$ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF | ||||
> y | ||||
> y | ||||
> EOF | ||||
adding a | ||||
% abort when modifying .hgsub w/dirty subrepo | ||||
M .hgsub | ||||
A sub2/a | ||||
% qrecord --config ui.interactive=1 -m1 1.diff | ||||
|
r33365 | abort: uncommitted changes in subrepository "sub2" | ||
|
r13174 | [255] | ||
% update substate when modifying .hgsub w/clean updated subrepo | ||||
M .hgsub | ||||
|
r25418 | A sub2/a | ||
|
r13174 | % qrecord --config ui.interactive=1 -m1 1.diff | ||
diff --git a/.hgsub b/.hgsub | ||||
1 hunks, 1 lines changed | ||||
|
r42766 | examine changes to '.hgsub'? | ||
(enter ? for help) [Ynesfdaq?] y | ||||
|
r22589 | |||
|
r13174 | @@ -1,1 +1,2 @@ | ||
sub = sub | ||||
+sub2 = sub2 | ||||
|
r42766 | record this change to '.hgsub'? | ||
(enter ? for help) [Ynesfdaq?] y | ||||
|
r22589 | |||
|
r13174 | path sub | ||
source sub | ||||
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 | ||||
path sub2 | ||||
source sub2 | ||||
revision 1f94c7611cc6b74f5a17b16121a1170d44776845 | ||||
$ hg qpop -qa | ||||
patch queue now empty | ||||
|
r13510 | $ testrm1 qrecord --config ui.interactive=1 -m2 2.diff <<EOF | ||
|
r13174 | > y | ||
> y | ||||
> EOF | ||||
adding a | ||||
% update substate when removing .hgsub w/dirty subrepo | ||||
M sub3/a | ||||
R .hgsub | ||||
% qrecord --config ui.interactive=1 -m2 2.diff | ||||
diff --git a/.hgsub b/.hgsub | ||||
deleted file mode 100644 | ||||
|
r42766 | examine changes to '.hgsub'? | ||
(enter ? for help) [Ynesfdaq?] y | ||||
|
r22589 | |||
|
r13174 | % debugsub should be empty | ||
$ hg qpop -qa | ||||
patch queue now empty | ||||
|
r13510 | $ testrm2 qrecord --config ui.interactive=1 -m3 3.diff <<EOF | ||
|
r13174 | > y | ||
> y | ||||
> EOF | ||||
adding a | ||||
% update substate when removing .hgsub w/clean updated subrepo | ||||
R .hgsub | ||||
% qrecord --config ui.interactive=1 -m3 3.diff | ||||
diff --git a/.hgsub b/.hgsub | ||||
deleted file mode 100644 | ||||
|
r42766 | examine changes to '.hgsub'? | ||
(enter ? for help) [Ynesfdaq?] y | ||||
|
r22589 | |||
|
r13174 | % debugsub should be empty | ||
$ cd .. | ||||
|
r14898 | |||
correctly handle subrepos with patch queues | ||||
$ mkrepo repo-subrepo-with-queue | ||||
$ mksubrepo sub | ||||
adding a | ||||
$ hg -R sub qnew sub0.diff | ||||
$ echo sub = sub >> .hgsub | ||||
$ hg add .hgsub | ||||
$ hg qnew 0.diff | ||||
|
r16913 | |||
$ cd .. | ||||
|
r17151 | |||
check whether MQ operations can import updated .hgsubstate correctly | ||||
both into 'revision' and 'patch file under .hg/patches': | ||||
$ hg init importing-hgsubstate | ||||
$ cd importing-hgsubstate | ||||
$ echo a > a | ||||
$ hg commit -u test -d '0 0' -Am '#0 in parent' | ||||
adding a | ||||
$ hg init sub | ||||
$ echo sa > sub/sa | ||||
$ hg -R sub commit -u test -d '0 0' -Am '#0 in sub' | ||||
adding sa | ||||
$ echo 'sub = sub' > .hgsub | ||||
$ touch .hgsubstate | ||||
$ hg add .hgsub .hgsubstate | ||||
$ hg qnew -u test -d '0 0' import-at-qnew | ||||
$ hg -R sub parents --template '{node} sub\n' | ||||
b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub | ||||
$ cat .hgsubstate | ||||
b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub | ||||
$ hg diff -c tip | ||||
|
r20786 | diff -r f499373e340c -r f69e96d86e75 .hgsub | ||
|
r17151 | --- /dev/null | ||
+++ b/.hgsub | ||||
@@ -0,0 +1,1 @@ | ||||
+sub = sub | ||||
|
r20786 | diff -r f499373e340c -r f69e96d86e75 .hgsubstate | ||
|
r17151 | --- /dev/null | ||
+++ b/.hgsubstate | ||||
@@ -0,0 +1,1 @@ | ||||
+b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub | ||||
$ cat .hg/patches/import-at-qnew | ||||
# HG changeset patch | ||||
# User test | ||||
# Date 0 0 | ||||
|
r22521 | # Parent f499373e340cdca5d01dee904aeb42dd2a325e71 | ||
|
r17151 | |||
|
r20786 | diff -r f499373e340c -r f69e96d86e75 .hgsub | ||
|
r17151 | --- /dev/null | ||
+++ b/.hgsub | ||||
@@ -0,0 +1,1 @@ | ||||
+sub = sub | ||||
|
r20786 | diff -r f499373e340c -r f69e96d86e75 .hgsubstate | ||
|
r17151 | --- /dev/null | ||
+++ b/.hgsubstate | ||||
@@ -0,0 +1,1 @@ | ||||
+b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub | ||||
|
r20786 | $ hg parents --template '{node}\n' | ||
f69e96d86e75a6d4fd88285dc9697acb23951041 | ||||
|
r20827 | $ hg parents --template '{files}\n' | ||
.hgsub .hgsubstate | ||||
|
r20786 | |||
check also whether qnew not including ".hgsubstate" explicitly causes | ||||
as same result (in node hash) as one including it. | ||||
$ hg qpop -a -q | ||||
patch queue now empty | ||||
$ hg qdelete import-at-qnew | ||||
$ echo 'sub = sub' > .hgsub | ||||
$ hg add .hgsub | ||||
$ rm -f .hgsubstate | ||||
$ hg qnew -u test -d '0 0' import-at-qnew | ||||
$ hg parents --template '{node}\n' | ||||
f69e96d86e75a6d4fd88285dc9697acb23951041 | ||||
|
r20827 | $ hg parents --template '{files}\n' | ||
.hgsub .hgsubstate | ||||
|
r20786 | |||
check whether qrefresh imports updated .hgsubstate correctly | ||||
|
r17151 | $ hg qpop | ||
popping import-at-qnew | ||||
patch queue now empty | ||||
$ hg qpush | ||||
applying import-at-qnew | ||||
now at: import-at-qnew | ||||
|
r20827 | $ hg parents --template '{files}\n' | ||
.hgsub .hgsubstate | ||||
|
r17151 | |||
|
r17152 | $ hg qnew import-at-qrefresh | ||
$ echo sb > sub/sb | ||||
$ hg -R sub commit -u test -d '0 0' -Am '#1 in sub' | ||||
adding sb | ||||
$ hg qrefresh -u test -d '0 0' | ||||
$ hg -R sub parents --template '{node} sub\n' | ||||
88ac1bef5ed43b689d1d200b59886b675dec474b sub | ||||
$ cat .hgsubstate | ||||
88ac1bef5ed43b689d1d200b59886b675dec474b sub | ||||
$ hg diff -c tip | ||||
|
r20827 | diff -r 05b056bb9c8c -r d987bec230f4 .hgsubstate | ||
|
r17152 | --- a/.hgsubstate | ||
+++ b/.hgsubstate | ||||
@@ -1,1 +1,1 @@ | ||||
-b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub | ||||
+88ac1bef5ed43b689d1d200b59886b675dec474b sub | ||||
$ cat .hg/patches/import-at-qrefresh | ||||
# HG changeset patch | ||||
|
r22546 | # User test | ||
|
r17152 | # Date 0 0 | ||
|
r22521 | # Parent 05b056bb9c8c05ff15258b84fd42ab3527271033 | ||
|
r17152 | |||
|
r20827 | diff -r 05b056bb9c8c .hgsubstate | ||
|
r17152 | --- a/.hgsubstate | ||
+++ b/.hgsubstate | ||||
@@ -1,1 +1,1 @@ | ||||
-b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub | ||||
+88ac1bef5ed43b689d1d200b59886b675dec474b sub | ||||
|
r20827 | $ hg parents --template '{files}\n' | ||
.hgsubstate | ||||
|
r17152 | |||
|
r17153 | $ hg qrefresh -u test -d '0 0' | ||
$ cat .hgsubstate | ||||
88ac1bef5ed43b689d1d200b59886b675dec474b sub | ||||
$ hg diff -c tip | ||||
|
r20827 | diff -r 05b056bb9c8c -r d987bec230f4 .hgsubstate | ||
|
r17153 | --- a/.hgsubstate | ||
+++ b/.hgsubstate | ||||
@@ -1,1 +1,1 @@ | ||||
-b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub | ||||
+88ac1bef5ed43b689d1d200b59886b675dec474b sub | ||||
$ cat .hg/patches/import-at-qrefresh | ||||
# HG changeset patch | ||||
|
r22546 | # User test | ||
|
r17153 | # Date 0 0 | ||
|
r22521 | # Parent 05b056bb9c8c05ff15258b84fd42ab3527271033 | ||
|
r17153 | |||
|
r20827 | diff -r 05b056bb9c8c .hgsubstate | ||
|
r17153 | --- a/.hgsubstate | ||
+++ b/.hgsubstate | ||||
@@ -1,1 +1,1 @@ | ||||
-b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub | ||||
+88ac1bef5ed43b689d1d200b59886b675dec474b sub | ||||
|
r20827 | $ hg parents --template '{files}\n' | ||
.hgsubstate | ||||
|
r17153 | |||
$ hg update -C tip | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg qpop -a | ||||
popping import-at-qrefresh | ||||
popping import-at-qnew | ||||
patch queue now empty | ||||
$ hg -R sub update -C 0 | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo 'sub = sub' > .hgsub | ||||
$ hg commit -Am '#1 in parent' | ||||
adding .hgsub | ||||
$ hg -R sub update -C 1 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r17537 | $ hg commit -Am '#2 in parent (but will be rolled back soon)' | ||
|
r17153 | $ hg rollback | ||
repository tip rolled back to revision 1 (undo commit) | ||||
working directory now based on revision 1 | ||||
$ hg status | ||||
M .hgsubstate | ||||
$ hg qnew -u test -d '0 0' checkstate-at-qnew | ||||
$ hg -R sub parents --template '{node} sub\n' | ||||
88ac1bef5ed43b689d1d200b59886b675dec474b sub | ||||
$ cat .hgsubstate | ||||
88ac1bef5ed43b689d1d200b59886b675dec474b sub | ||||
$ hg diff -c tip | ||||
diff -r 4d91eb2fa1d1 -r 1259c112d884 .hgsubstate | ||||
--- a/.hgsubstate | ||||
+++ b/.hgsubstate | ||||
@@ -1,1 +1,1 @@ | ||||
-b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub | ||||
+88ac1bef5ed43b689d1d200b59886b675dec474b sub | ||||
$ cat .hg/patches/checkstate-at-qnew | ||||
# HG changeset patch | ||||
# User test | ||||
# Date 0 0 | ||||
|
r22521 | # Parent 4d91eb2fa1d1b22ec513347b9cd06f6b49d470fa | ||
|
r17153 | |||
diff -r 4d91eb2fa1d1 -r 1259c112d884 .hgsubstate | ||||
--- a/.hgsubstate | ||||
+++ b/.hgsubstate | ||||
@@ -1,1 +1,1 @@ | ||||
-b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub | ||||
+88ac1bef5ed43b689d1d200b59886b675dec474b sub | ||||
|
r20827 | $ hg parents --template '{files}\n' | ||
.hgsubstate | ||||
|
r17153 | |||
|
r20786 | check whether qrefresh not including ".hgsubstate" explicitly causes | ||
as same result (in node hash) as one including it. | ||||
$ hg update -C -q 0 | ||||
$ hg qpop -a -q | ||||
patch queue now empty | ||||
$ hg qnew -u test -d '0 0' add-hgsub-at-qrefresh | ||||
$ echo 'sub = sub' > .hgsub | ||||
$ echo > .hgsubstate | ||||
$ hg add .hgsub .hgsubstate | ||||
$ hg qrefresh -u test -d '0 0' | ||||
$ hg parents --template '{node}\n' | ||||
7c48c35501aae6770ed9c2517014628615821a8e | ||||
|
r20827 | $ hg parents --template '{files}\n' | ||
.hgsub .hgsubstate | ||||
|
r20786 | |||
$ hg qpop -a -q | ||||
patch queue now empty | ||||
$ hg qdelete add-hgsub-at-qrefresh | ||||
$ hg qnew -u test -d '0 0' add-hgsub-at-qrefresh | ||||
$ echo 'sub = sub' > .hgsub | ||||
$ hg add .hgsub | ||||
$ rm -f .hgsubstate | ||||
$ hg qrefresh -u test -d '0 0' | ||||
$ hg parents --template '{node}\n' | ||||
7c48c35501aae6770ed9c2517014628615821a8e | ||||
|
r20827 | $ hg parents --template '{files}\n' | ||
.hgsub .hgsubstate | ||||
|
r20786 | |||
|
r17151 | $ cd .. | ||
$ cd .. | ||||