##// END OF EJS Templates
narrow: strip trailing `/` from manifest dir before matching it...
Martin von Zweigbergk -
r52169:03665fd8 default
parent child Browse files
Show More
@@ -296,7 +296,7 b' def _narrow('
296 for file_ in entry.files():
296 for file_ in entry.files():
297 todelete.append(file_.unencoded_path)
297 todelete.append(file_.unencoded_path)
298 elif entry.is_manifestlog:
298 elif entry.is_manifestlog:
299 dir = entry.target_id
299 dir = entry.target_id[:-1]
300 dirs = sorted(pathutil.dirs({dir})) + [dir]
300 dirs = sorted(pathutil.dirs({dir})) + [dir]
301 include = True
301 include = True
302 for d in dirs:
302 for d in dirs:
@@ -550,25 +550,11 b' Test removing `rootfilesin:` include'
550 $ hg clone --narrow ssh://user@dummy/master narrow-concurrent-modify -q \
550 $ hg clone --narrow ssh://user@dummy/master narrow-concurrent-modify -q \
551 > --include rootfilesin:d0 --include rootfilesin:d1
551 > --include rootfilesin:d0 --include rootfilesin:d1
552 $ cd narrow-concurrent-modify
552 $ cd narrow-concurrent-modify
553 #if flat
554 $ hg --config 'hooks.pretxnopen = echo modified >> d0/f' tracked --removeinclude rootfilesin:d0
553 $ hg --config 'hooks.pretxnopen = echo modified >> d0/f' tracked --removeinclude rootfilesin:d0
555 comparing with ssh://user@dummy/master
554 comparing with ssh://user@dummy/master
556 searching for changes
555 searching for changes
557 looking for local changes to affected paths
556 looking for local changes to affected paths
558 deleting data/d0/f.i
557 deleting data/d0/f.i
558 deleting meta/d0/00manifest.i (tree !)
559 deleting unwanted files from working copy
559 deleting unwanted files from working copy
560 not deleting possibly dirty file d0/f
560 not deleting possibly dirty file d0/f
561 #endif
562 #if tree
563 $ hg --config 'hooks.pretxnopen = echo modified >> d0/f' tracked --removeinclude rootfilesin:d0
564 comparing with ssh://user@dummy/master
565 searching for changes
566 looking for local changes to affected paths
567 deleting data/d0/f.i
568 deleting meta/d0/00manifest.i
569 deleting meta/d1/00manifest.i (known-bad-output !)
570 deleting unwanted files from working copy
571 not deleting possibly dirty file d0/f
572 abort: meta/d1/00manifest@77a3e194be076ae47ba9282271028916012d815c: no node (known-bad-output !)
573 [50]
574 #endif
General Comments 0
You need to be logged in to leave comments. Login now