annotate tests/test-transaction-wc-rollback-race.t @ 52293:77b38c86915d

ci: add a small script one can run to purge older pipeline We have over ten thousands old pipeline that take a huge space and that I suspect to be the source of some slowdown in merge request. However it seems that the only way to clear them is manually and through the API, so lets do it. The script was run today.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 12 Nov 2024 12:45:23 +0100
parents d7e61891ab5a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
50169
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
1 =======================================================================
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
2 Check potential race condition around transaction and working copy data
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
3 =======================================================================
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
4
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
5 #testcases bookmarks-in-store bookmarks-wc-level
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
6
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
7 The transaction is garanteed to run with the lock, but may runs without the
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
8 wlock. So if the transaction backup/restore some content related to the
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
9 working-copy and protected by the wlock, we might run into trouble if another
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
10 process grab the wlock and modify them.
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
11
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
12 This test file is testing various cases where such parallel changes happens to
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
13 validate the transaction behavior.
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
14
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
15 Other is used to get a simple pull source. As pull is a simple way to create
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
16 transaction without the wlock.
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
17
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
18 Setup
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
19 =====
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
20
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
21 Avoid long deadlock
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
22
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
23 $ cat << EOF >> $HGRCPATH
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
24 > [ui]
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
25 > timeout=10
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
26 > EOF
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
27
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
28 #if bookmarks-in-store
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
29 $ cat << EOF >> $HGRCPATH
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
30 > [format]
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
31 > bookmarks-in-store = yes
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
32 > EOF
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
33 #endif
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
34
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
35
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
36 $ hg init repo
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
37 $ cd repo
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
38 $ for filename in a b c d e f g h i j k l m; do
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
39 > echo $filename > default_$filename
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
40 > hg add default_$filename
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
41 > hg commit --quiet --message default_$filename
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
42 > done
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
43 $ hg bookmark --rev . foo
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
44 $ hg branch babar
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
45 marked working directory as branch babar
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
46 (branches are permanent and global, did you want a bookmark?)
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
47 $ for filename in a b c d e f g h i j k l m; do
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
48 > echo $filename > babar_$filename
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
49 > hg add babar_$filename
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
50 > hg commit --quiet --message babar_$filename
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
51 > done
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
52 $ hg bookmark --rev . bar
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
53 $ hg up 'desc("default_m")'
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
54 0 files updated, 0 files merged, 13 files removed, 0 files unresolved
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
55 $ hg log -G -T '[{branch}] ({bookmarks}) {desc}\n'
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
56 o [babar] (bar) babar_m
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
57 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
58 o [babar] () babar_l
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
59 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
60 o [babar] () babar_k
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
61 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
62 o [babar] () babar_j
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
63 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
64 o [babar] () babar_i
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
65 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
66 o [babar] () babar_h
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
67 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
68 o [babar] () babar_g
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
69 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
70 o [babar] () babar_f
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
71 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
72 o [babar] () babar_e
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
73 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
74 o [babar] () babar_d
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
75 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
76 o [babar] () babar_c
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
77 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
78 o [babar] () babar_b
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
79 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
80 o [babar] () babar_a
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
81 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
82 @ [default] (foo) default_m
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
83 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
84 o [default] () default_l
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
85 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
86 o [default] () default_k
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
87 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
88 o [default] () default_j
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
89 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
90 o [default] () default_i
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
91 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
92 o [default] () default_h
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
93 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
94 o [default] () default_g
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
95 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
96 o [default] () default_f
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
97 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
98 o [default] () default_e
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
99 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
100 o [default] () default_d
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
101 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
102 o [default] () default_c
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
103 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
104 o [default] () default_b
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
105 |
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
106 o [default] () default_a
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
107
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
108
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
109 $ cat << EOF >> ../txn-close.sh
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
110 > rm -f "$TESTTMP/transaction-continue"
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
111 > "$RUNTESTDIR/testlib/wait-on-file" 5 "$TESTTMP/transaction-continue" "$TESTTMP/transaction-waiting"
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
112 > rm -f "$TESTTMP/transaction-waiting"
50169
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
113 > exit 1
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
114 > EOF
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
115
50169
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
116 $ cat << EOF >> .hg/hgrc
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
117 > [hooks]
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
118 > pretxnclose.test = sh "$TESTTMP/txn-close.sh"
50169
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
119 > EOF
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
120
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
121 Check the overall logic is working, the transaction is holding the `lock` , but
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
122 not the `wlock`, then get aborted on a signal-file.
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
123
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
124 $ hg phase --rev 0
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
125 0: draft
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
126 $ hg phase --public --rev 0 2> ../log.err &
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
127 $ $RUNTESTDIR/testlib/wait-on-file 5 $TESTTMP/transaction-waiting
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
128 $ echo y | hg --config ui.interactive=yes debuglock --set-wlock
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
129 ready to release the lock (y)? y
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
130 $ echo y | hg --config ui.interactive=yes debuglock --set-lock
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
131 abort: lock is already held
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
132 [255]
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
133 $ touch "$TESTTMP/transaction-continue"
50169
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
134 $ wait
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
135 $ hg phase --rev 0
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
136 0: draft
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
137 $ cat ../log.err
34ab5c7b7f98 transaction: the base of a new test file checking transaction abort issue
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
138 abort: pretxnclose.test hook exited with status 1
50170
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
139
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
140 Actual testing
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
141 ==============
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
142
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
143 Changing tracked file
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
144 ---------------------
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
145
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
146 $ hg status
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
147 $ hg phase --public --rev 0 2> ../log.err &
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
148 $ "$RUNTESTDIR/testlib/wait-on-file" 5 "$TESTTMP/transaction-waiting"
50170
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
149 $ hg forget default_a
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
150 $ hg status
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
151 R default_a
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
152 $ touch "$TESTTMP/transaction-continue"
50170
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
153 $ wait
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
154 $ hg status
50174
596a6b9b0570 branching: merge stable into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50173
diff changeset
155 R default_a
50170
a9a13b160db9 transaction: tests we don't overwrite tracking to changed file on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50169
diff changeset
156 $ hg revert --all --quiet
50171
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
157
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
158 Changing branch from default
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
159 ----------------------------
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
160
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
161 $ hg branch
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
162 default
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
163 $ hg phase --public --rev 0 2> ../log.err &
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
164 $ "$RUNTESTDIR/testlib/wait-on-file" 5 "$TESTTMP/transaction-waiting"
50171
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
165 $ hg branch celeste
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
166 marked working directory as branch celeste
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
167 $ hg branch
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
168 celeste
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
169 $ touch "$TESTTMP/transaction-continue"
50171
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
170 $ wait
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
171 $ hg branch
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
172 celeste
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
173
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
174 Changing branch from another one
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
175 --------------------------------
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
176
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
177 $ hg up babar --quiet
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
178 $ hg branch
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
179 babar
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
180 $ hg phase --public --rev 0 2> ../log.err &
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
181 $ "$RUNTESTDIR/testlib/wait-on-file" 5 "$TESTTMP/transaction-waiting"
50171
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
182 $ hg branch celeste
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
183 marked working directory as branch celeste
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
184 $ hg branch
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
185 celeste
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
186 $ touch "$TESTTMP/transaction-continue"
50171
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
187 $ wait
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
188 $ hg branch
d956ceed3289 transaction: tests we don't overwrite branch changes on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50170
diff changeset
189 celeste
50172
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
190
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
191 updating working copy
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
192 ---------------------
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
193
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
194 $ hg st
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
195 $ hg log --rev . -T '{desc}\n'
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
196 babar_m
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
197 $ hg phase --public --rev 0 2> ../log.err &
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
198 $ $RUNTESTDIR/testlib/wait-on-file 5 "$TESTTMP/transaction-waiting"
50172
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
199 $ hg update "parents(.)" --quiet
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
200 $ hg log --rev . -T '{desc}\n'
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
201 babar_l
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
202 $ hg st
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
203 $ touch "$TESTTMP/transaction-continue"
50172
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
204 $ wait
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
205 $ hg log --rev . -T '{desc}\n'
50174
596a6b9b0570 branching: merge stable into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50173
diff changeset
206 babar_l
50172
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
207 $ hg st
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
208
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
209 $ hg purge --no-confirm
b90899794ced transaction: tests we don't overwrite updates on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50171
diff changeset
210 $ hg up --quiet babar
50173
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
211
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
212 Activating a bookmark
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
213 ---------------------
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
214 (without going through the bookmark command)
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
215
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
216 Show the activation/desactivation pattern that exist without taking the store
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
217 lock.
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
218
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
219 $ hg log -r . -T '= {activebookmark} =\n'
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
220 = =
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
221 $ hg up bar
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
222 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
223 (activating bookmark bar)
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
224 $ hg log -r . -T '= {activebookmark} =\n'
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
225 = bar =
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
226 $ hg up .
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
227 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
228 (leaving bookmark bar)
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
229 $ hg log -r . -T '= {activebookmark} =\n'
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
230 = =
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
231
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
232 Activating the bookmark during a transaction
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
233
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
234 $ hg up . --quiet
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
235 $ hg log -r . -T '= {activebookmark} =\n'
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
236 = =
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
237 $ hg phase --public --rev 0 2> ../log.err &
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
238 $ $RUNTESTDIR/testlib/wait-on-file 5 "$TESTTMP/transaction-waiting"
50173
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
239 $ hg up bar
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
240 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
241 (activating bookmark bar)
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
242 $ hg log -r . -T '= {activebookmark} =\n'
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
243 = bar =
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
244 $ touch "$TESTTMP/transaction-continue"
50173
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
245 $ wait
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
246 $ hg log -r . -T '= {activebookmark} =\n'
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
247 = bar =
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
248
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
249 Deactivating the bookmark
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
250
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
251 $ hg up bar --quiet
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
252 $ hg log -r . -T '= {activebookmark} =\n'
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
253 = bar =
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
254 $ hg phase --public --rev 0 2> ../log.err &
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
255 $ $RUNTESTDIR/testlib/wait-on-file 5 "$TESTTMP/transaction-waiting"
50173
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
256 $ hg up .
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
257 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
258 (leaving bookmark bar)
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
259 $ hg log -r . -T '= {activebookmark} =\n'
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
260 = =
51946
d7e61891ab5a tests: stabilize `test-transaction-wc-rollback-race.t` on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 50174
diff changeset
261 $ touch "$TESTTMP/transaction-continue"
50173
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
262 $ wait
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
263 $ hg log -r . -T '= {activebookmark} =\n'
bf27727e6c78 transaction: tests we don't overwrite bookmark activation on abort
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 50172
diff changeset
264 = =