##// END OF EJS Templates
repair: no need to call filterunknown() in strip()...
Patrick Mezard -
r16623:def6a19c default
parent child Browse files
Show More
@@ -6,7 +6,7 b''
6 # This software may be used and distributed according to the terms of the
6 # This software may be used and distributed according to the terms of the
7 # GNU General Public License version 2 or any later version.
7 # GNU General Public License version 2 or any later version.
8
8
9 from mercurial import changegroup, bookmarks, phases
9 from mercurial import changegroup, bookmarks
10 from mercurial.node import short
10 from mercurial.node import short
11 from mercurial.i18n import _
11 from mercurial.i18n import _
12 import os
12 import os
@@ -170,7 +170,3 b' def strip(ui, repo, nodelist, backup="al'
170 raise
170 raise
171
171
172 repo.destroyed()
172 repo.destroyed()
173
174 # remove potential unknown phase
175 # XXX using to_strip data would be faster
176 phases.filterunknown(repo)
@@ -558,6 +558,7 b' Commit and show expansion in original an'
558 $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
558 $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
559 c
559 c
560 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
560 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
561 removing unknown node 40a904bbbe4c from 1-phase boundary
561 overwriting c expanding keywords
562 overwriting c expanding keywords
562 committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
563 committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
563 $ cat a c
564 $ cat a c
@@ -722,6 +723,7 b' Commit with multiline message and custom'
722
723
723 $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
724 $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
724 a
725 a
726 removing unknown node 40a904bbbe4c from 1-phase boundary
725 overwriting a expanding keywords
727 overwriting a expanding keywords
726 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
728 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
727 $ rm log
729 $ rm log
General Comments 0
You need to be logged in to leave comments. Login now