##// END OF EJS Templates
narrow: raise StateError when working copy is stale (for detailed exit code)...
Martin von Zweigbergk -
r49044:7ed0fc68 default
parent child Browse files
Show More
@@ -299,7 +299,7 b' def checkworkingcopynarrowspec(repo):'
299 storespec = repo.svfs.tryread(FILENAME)
299 storespec = repo.svfs.tryread(FILENAME)
300 wcspec = repo.vfs.tryread(DIRSTATE_FILENAME)
300 wcspec = repo.vfs.tryread(DIRSTATE_FILENAME)
301 if wcspec != storespec:
301 if wcspec != storespec:
302 raise error.Abort(
302 raise error.StateError(
303 _(b"working copy's narrowspec is stale"),
303 _(b"working copy's narrowspec is stale"),
304 hint=_(b"run 'hg tracked --update-working-copy'"),
304 hint=_(b"run 'hg tracked --update-working-copy'"),
305 )
305 )
@@ -100,7 +100,7 b' Narrow the share and check that the main'
100 $ hg -R main files
100 $ hg -R main files
101 abort: working copy's narrowspec is stale
101 abort: working copy's narrowspec is stale
102 (run 'hg tracked --update-working-copy')
102 (run 'hg tracked --update-working-copy')
103 [255]
103 [20]
104 $ hg -R main tracked --update-working-copy
104 $ hg -R main tracked --update-working-copy
105 not deleting possibly dirty file d3/f
105 not deleting possibly dirty file d3/f
106 not deleting possibly dirty file d3/g
106 not deleting possibly dirty file d3/g
@@ -138,7 +138,7 b' Widen the share and check that the main '
138 $ hg -R main files
138 $ hg -R main files
139 abort: working copy's narrowspec is stale
139 abort: working copy's narrowspec is stale
140 (run 'hg tracked --update-working-copy')
140 (run 'hg tracked --update-working-copy')
141 [255]
141 [20]
142 $ hg -R main tracked --update-working-copy
142 $ hg -R main tracked --update-working-copy
143 # d1/f, d3/f should be back
143 # d1/f, d3/f should be back
144 $ hg -R main files
144 $ hg -R main files
@@ -189,7 +189,7 b' Make it look like a repo from before nar'
189 $ hg ci -Am test
189 $ hg ci -Am test
190 abort: working copy's narrowspec is stale
190 abort: working copy's narrowspec is stale
191 (run 'hg tracked --update-working-copy')
191 (run 'hg tracked --update-working-copy')
192 [255]
192 [20]
193 $ hg tracked --update-working-copy
193 $ hg tracked --update-working-copy
194 $ hg st
194 $ hg st
195 M d1/f
195 M d1/f
General Comments 0
You need to be logged in to leave comments. Login now