--- a/tests/test-mq-subrepo.t Fri Mar 30 14:35:06 2012 -0500
+++ b/tests/test-mq-subrepo.t Fri Mar 30 22:08:46 2012 +0100
@@ -263,7 +263,7 @@
% qrecord --config ui.interactive=1 -m0 0.diff
diff --git a/.hgsub b/.hgsub
new file mode 100644
- examine changes to '.hgsub'? [Ynsfdaq?]
+ examine changes to '.hgsub'? [Ynesfdaq?]
abort: uncommitted changes in subrepository sub
[255]
% update substate when adding .hgsub w/clean updated subrepo
@@ -271,7 +271,7 @@
% qrecord --config ui.interactive=1 -m0 0.diff
diff --git a/.hgsub b/.hgsub
new file mode 100644
- examine changes to '.hgsub'? [Ynsfdaq?]
+ examine changes to '.hgsub'? [Ynesfdaq?]
path sub
source sub
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
@@ -287,11 +287,11 @@
% qrecord --config ui.interactive=1 -m1 1.diff
diff --git a/.hgsub b/.hgsub
1 hunks, 1 lines changed
- examine changes to '.hgsub'? [Ynsfdaq?]
+ examine changes to '.hgsub'? [Ynesfdaq?]
@@ -1,1 +1,2 @@
sub = sub
+sub2 = sub2
- record this change to '.hgsub'? [Ynsfdaq?]
+ record this change to '.hgsub'? [Ynesfdaq?]
abort: uncommitted changes in subrepository sub2
[255]
% update substate when modifying .hgsub w/clean updated subrepo
@@ -299,11 +299,11 @@
% qrecord --config ui.interactive=1 -m1 1.diff
diff --git a/.hgsub b/.hgsub
1 hunks, 1 lines changed
- examine changes to '.hgsub'? [Ynsfdaq?]
+ examine changes to '.hgsub'? [Ynesfdaq?]
@@ -1,1 +1,2 @@
sub = sub
+sub2 = sub2
- record this change to '.hgsub'? [Ynsfdaq?]
+ record this change to '.hgsub'? [Ynesfdaq?]
path sub
source sub
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
@@ -324,7 +324,7 @@
% qrecord --config ui.interactive=1 -m2 2.diff
diff --git a/.hgsub b/.hgsub
deleted file mode 100644
- examine changes to '.hgsub'? [Ynsfdaq?]
+ examine changes to '.hgsub'? [Ynesfdaq?]
% debugsub should be empty
$ hg qpop -qa
@@ -339,7 +339,7 @@
% qrecord --config ui.interactive=1 -m3 3.diff
diff --git a/.hgsub b/.hgsub
deleted file mode 100644
- examine changes to '.hgsub'? [Ynsfdaq?]
+ examine changes to '.hgsub'? [Ynesfdaq?]
% debugsub should be empty
$ cd ..