Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
Matt Mackall
- Fri, 03 May 2013 20:34:18
Show More
mercurial/cmdutil.py
0
+6
0
@@
-2055,6
+2055,12
b' def revert(ui, repo, ctx, parents, *pats'
2055
2055
checkout ( f )
2056
2056
normal ( f )
2057
2057
2058
copied = copies . pathcopies ( repo [ parent ], ctx )
2059
2060
for f in add [ 0 ] + undelete [ 0 ] + revert [ 0 ]:
2061
if f in copied :
2062
repo . dirstate . copy ( copied [ f ], f )
2063
2058
2064
if targetsubs :
2059
2065
# Revert the subrepos on the revert list
2060
2066
for sub in targetsubs :
mercurial/dirstate.py
0
+1
-1
@@
-700,7
+700,7
b' class dirstate(object):'
700
700
for nf in iter ( visit ):
701
701
# Report ignored items in the dmap as long as they are not
702
702
# under a symlink directory.
703
if ignore(nf) and audit_path . check ( nf ):
703
if audit_path . check ( nf ):
704
704
try :
705
705
results [ nf ] = lstat ( join ( nf ))
706
706
except OSError :
tests/test-hgignore.t
0
+10
0
@@
-124,3
+124,13
b' Check it does not ignore the current dir'
124
124
( ?: ( ?:|. * / )[ ^/ ] * ( ?:/| $ ))
125
125
126
126
$ cd ..
127
128
Check patterns that match only the directory
129
130
$ echo "^dir\$" > . hgignore
131
$ hg status
132
A dir / b . o
133
? . hgignore
134
? a . c
135
? a . o
136
? syntax
tests/test-revert.t
0
+24
0
@@
-275,4
+275,28
b' should silently revert the named files'
275
275
$ hg revert -- no - backup ignored removed
276
276
$ hg st - mardi
277
277
278
someone set up us the copies
279
280
$ rm . hgignore
281
$ hg update - C
282
0 files updated , 0 files merged , 0 files removed , 0 files unresolved
283
$ hg mv ignored allyour
284
$ hg copy removed base
285
$ hg commit - m rename
286
287
copies and renames , you have no chance to survive make your time ( issue3920 )
288
289
$ hg update '.^'
290
1 files updated , 0 files merged , 2 files removed , 0 files unresolved
291
$ hg revert - rtip - a
292
adding allyour
293
adding base
294
removing ignored
295
$ hg status - C
296
A allyour
297
ignored
298
A base
299
removed
300
R ignored
301
278
302
$ cd ..
Site-wide shortcuts
/
Use quick search box
g h
Goto home page
g g
Goto my private gists page
g G
Goto my public gists page
g 0-9
Goto bookmarked items from 0-9
n r
New repository page
n g
New gist page
Repositories
g s
Goto summary page
g c
Goto changelog page
g f
Goto files page
g F
Goto files page with file search activated
g p
Goto pull requests page
g o
Goto repository settings
g O
Goto repository access permissions settings
t s
Toggle sidebar on some pages