[PATCH 18 of 21] mq: lowercase output
Martin Geisler
mg at daimi.au.dk
Sat Jan 3 10:40:16 CST 2009
# HG changeset patch
# User Martin Geisler <mg at daimi.au.dk>
# Date 1230999321 -3600
# Node ID 77ad9a533475ed5655449af94bd958d61dce0325
# Parent 03f46c1b456abbe00a820ab3e315b8a6edcc9245
mq: lowercase output
This extension produces quite a lot of informational messages during
its normal operation and it is hard to say which strings can be
changed and which cannot.
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -965,10 +965,10 @@
raise
top = self.applied[-1].name
if ret[0]:
- self.ui.write(_("Errors during apply, please fix and "
+ self.ui.write(_("errors during apply, please fix and "
"refresh %s\n") % top)
else:
- self.ui.write(_("Now at: %s\n") % top)
+ self.ui.write(_("now at: %s\n") % top)
return ret[0]
finally:
del wlock
@@ -1058,16 +1058,16 @@
del self.applied[start:end]
self.strip(repo, rev, update=False, backup='strip')
if len(self.applied):
- self.ui.write(_("Now at: %s\n") % self.applied[-1].name)
+ self.ui.write(_("now at: %s\n") % self.applied[-1].name)
else:
- self.ui.write(_("Patch queue now empty\n"))
+ self.ui.write(_("patch queue now empty\n"))
finally:
del wlock
def diff(self, repo, pats, opts):
top = self.check_toppatch(repo)
if not top:
- self.ui.write(_("No patches applied\n"))
+ self.ui.write(_("no patches applied\n"))
return
qp = self.qparents(repo, top)
self._diffopts = patch.diffopts(self.ui, opts)
@@ -1075,7 +1075,7 @@
def refresh(self, repo, pats=None, **opts):
if len(self.applied) == 0:
- self.ui.write(_("No patches applied\n"))
+ self.ui.write(_("no patches applied\n"))
return 1
msg = opts.get('msg', '').rstrip()
newuser = opts.get('user')
@@ -1783,7 +1783,7 @@
return q.qseries(repo, start=t-1, length=1, status='A',
summary=opts.get('summary'))
else:
- ui.write(_("No patches applied\n"))
+ ui.write(_("no patches applied\n"))
return 1
def next(ui, repo, **opts):
@@ -1791,7 +1791,7 @@
q = repo.mq
end = q.series_end()
if end == len(q.series):
- ui.write(_("All patches applied\n"))
+ ui.write(_("all patches applied\n"))
return 1
return q.qseries(repo, start=end, length=1, summary=opts.get('summary'))
@@ -1800,10 +1800,10 @@
q = repo.mq
l = len(q.applied)
if l == 1:
- ui.write(_("Only one patch applied\n"))
+ ui.write(_("only one patch applied\n"))
return 1
if not l:
- ui.write(_("No patches applied\n"))
+ ui.write(_("no patches applied\n"))
return 1
return q.qseries(repo, start=l-2, length=1, status='A',
summary=opts.get('summary'))
@@ -1867,7 +1867,7 @@
message = cmdutil.logmessage(opts)
if opts['edit']:
if not q.applied:
- ui.write(_("No patches applied\n"))
+ ui.write(_("no patches applied\n"))
return 1
if message:
raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
@@ -2022,7 +2022,7 @@
patch = q.lookup(patch)
else:
if not q.applied:
- ui.write('No patches applied\n')
+ ui.write('no patches applied\n')
return 1
patch = q.lookup('qtip')
ph = repo.mq.readheaders(patch)
@@ -2109,7 +2109,7 @@
patch = q.lookup(patch)
else:
if not q.applied:
- ui.write(_('No patches applied\n'))
+ ui.write(_('no patches applied\n'))
return
patch = q.lookup('qtip')
absdest = q.join(name)
@@ -2123,7 +2123,7 @@
raise util.Abort(_('a patch named %s already exists in the series file') % name)
if ui.verbose:
- ui.write('Renaming %s to %s\n' % (patch, name))
+ ui.write('renaming %s to %s\n' % (patch, name))
i = q.find_series(patch)
guards = q.guard_re.findall(q.full_series[i])
q.full_series[i] = name + ''.join([' #' + g for g in guards])
diff --git a/tests/test-hardlinks-safety.out b/tests/test-hardlinks-safety.out
--- a/tests/test-hardlinks-safety.out
+++ b/tests/test-hardlinks-safety.out
@@ -2,10 +2,10 @@
% init
adding foo to series file
applying foo
-Now at: foo
+now at: foo
adding bar to series file
applying bar
-Now at: bar
+now at: bar
430ed4828a74fa4047bc816a25500f7472ab4bfe:foo
4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar
%
diff --git a/tests/test-keyword.out b/tests/test-keyword.out
--- a/tests/test-keyword.out
+++ b/tests/test-keyword.out
@@ -213,15 +213,15 @@
+$Id$
+tests for different changenodes
% qpop
-Patch queue now empty
+patch queue now empty
% qgoto - should imply qpush
applying mqtest.diff
-Now at: mqtest.diff
+now at: mqtest.diff
% cat
$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
tests for different changenodes
% qpop and move on
-Patch queue now empty
+patch queue now empty
% copy
% kwfiles added
a
diff --git a/tests/test-mq-caches.out b/tests/test-mq-caches.out
--- a/tests/test-mq-caches.out
+++ b/tests/test-mq-caches.out
@@ -5,7 +5,7 @@
No branch cache
# some regular revisions
-Patch queue now empty
+patch queue now empty
tip: 1
3f910abad313ff802d3a23a7529433872df9b3ae 1
3f910abad313ff802d3a23a7529433872df9b3ae bar
@@ -13,7 +13,7 @@
# add some mq patches
applying p1
-Now at: p1
+now at: p1
tip: 2
3f910abad313ff802d3a23a7529433872df9b3ae 1
3f910abad313ff802d3a23a7529433872df9b3ae bar
@@ -43,11 +43,11 @@
qbase: 1
# detect an invalid cache
-Patch queue now empty
+patch queue now empty
applying p0
applying p1
applying p2
-Now at: p2
+now at: p2
tip: 3
9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0
9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
diff --git a/tests/test-mq-guards.out b/tests/test-mq-guards.out
--- a/tests/test-mq-guards.out
+++ b/tests/test-mq-guards.out
@@ -1,68 +1,68 @@
adding x
-Patch queue now empty
+patch queue now empty
% should fail
abort: no patch named does-not-exist.patch
% should fail
abort: no patches applied
applying a.patch
-Now at: a.patch
+now at: a.patch
% should guard a.patch
% should print +a
a.patch: +a
-Patch queue now empty
+patch queue now empty
% should fail
cannot push 'a.patch' - guarded by ['+a']
a.patch: +a
% should push b.patch
applying b.patch
-Now at: b.patch
-Patch queue now empty
+now at: b.patch
+patch queue now empty
% test selection of an empty guard
abort: guard cannot be an empty string
number of unguarded, unapplied patches has changed from 2 to 3
% should push a.patch
applying a.patch
-Now at: a.patch
+now at: a.patch
% should print -a
c.patch: -a
% should skip c.patch
applying b.patch
skipping c.patch - guarded by '-a'
-Now at: b.patch
+now at: b.patch
% should display b.patch
b.patch
% should push c.patch
applying c.patch
-Now at: c.patch
-Patch queue now empty
+now at: c.patch
+patch queue now empty
guards deactivated
number of unguarded, unapplied patches has changed from 3 to 2
% should push all
applying b.patch
applying c.patch
-Now at: c.patch
-Patch queue now empty
+now at: c.patch
+patch queue now empty
number of unguarded, unapplied patches has changed from 1 to 2
% should push a.patch, not b.patch
applying a.patch
-Now at: a.patch
+now at: a.patch
applying c.patch
-Now at: c.patch
-Patch queue now empty
+now at: c.patch
+patch queue now empty
% should push b.patch
applying b.patch
-Now at: b.patch
+now at: b.patch
applying c.patch
-Now at: c.patch
+now at: c.patch
c.patch
-Patch queue now empty
+patch queue now empty
number of unguarded, unapplied patches has changed from 2 to 3
% should push a.patch, b.patch
applying a.patch
-Now at: a.patch
+now at: a.patch
applying b.patch
-Now at: b.patch
-Patch queue now empty
+now at: b.patch
+patch queue now empty
number of unguarded, unapplied patches has changed from 3 to 2
% list patches and guards
a.patch: +1 +2 -3
@@ -78,15 +78,15 @@
3
% should push b.patch
applying b.patch
-Now at: b.patch
+now at: b.patch
applying c.patch
-Now at: c.patch
+now at: c.patch
guards deactivated
popping guarded patches
-Patch queue now empty
+patch queue now empty
reapplying unguarded patches
applying c.patch
-Now at: c.patch
+now at: c.patch
% guards in series file: +1 +2 -3
+1
+2
@@ -100,7 +100,7 @@
new.patch: +1 +2 -3
b.patch: +2
c.patch: unguarded
-Now at: c.patch
+now at: c.patch
% should show new.patch and b.patch as Guarded, c.patch as Applied
% and d.patch as Unapplied
0 G new.patch
@@ -112,7 +112,7 @@
1 G b.patch
2 A c.patch
3 G d.patch
-Patch queue now empty
+patch queue now empty
new.patch: +1 +2 -3
b.patch: +2
c.patch: unguarded
@@ -141,7 +141,7 @@
skipping b.patch - guarded by ['+2']
applying c.patch
skipping d.patch - guarded by ['+2']
-Now at: c.patch
+now at: c.patch
% hg qapplied
new.patch
c.patch
diff --git a/tests/test-mq-header-date.out b/tests/test-mq-header-date.out
--- a/tests/test-mq-header-date.out
+++ b/tests/test-mq-header-date.out
@@ -42,7 +42,7 @@
+2
1: [mq]: 2.patch - test
0: [mq]: 1.patch - test
-Now at: 1.patch
+now at: 1.patch
==== qnew -d -m
# HG changeset patch
# Date 6 0
@@ -126,10 +126,9 @@
2: Four - test
1: Three (again) - test
0: [mq]: 1.patch - test
-Now at: 3.patch
+now at: 3.patch
==== qnew with HG header
-Now at: 3.patch
-Now at: 5.patch
+now at: 3.patch
# HG changeset patch
# Date 10 0
2: imported patch 5.patch - test - 10.00
@@ -185,7 +184,7 @@
2: [mq]: 5.patch - test
1: Three (again) - test
0: [mq]: 1.patch - test
-Now at: 5.patch
+now at: 5.patch
==== qnew -d
adding 7
# HG changeset patch
@@ -240,7 +239,7 @@
2: [mq]: 5.patch - test
1: Three (again) - test
0: [mq]: 1.patch - test
-Now at: 7.patch
+now at: 7.patch
==== qnew -m
adding 9
Nine
@@ -270,14 +269,14 @@
2: [mq]: 5.patch - test
1: Three (again) - test
0: [mq]: 1.patch - test
-Now at: 7.patch
+now at: 7.patch
==== qpop -a / qpush -a
-Patch queue now empty
+patch queue now empty
applying 1.patch
applying 3.patch
applying 5.patch
applying 7.patch
-Now at: 7.patch
+now at: 7.patch
3: imported patch 7.patch - john - 13.00
2: imported patch 5.patch - test - 11.00
1: Three (again) - test - 8.00
diff --git a/tests/test-mq-header-from b/tests/test-mq-header-from
--- a/tests/test-mq-header-from
+++ b/tests/test-mq-header-from
@@ -83,7 +83,7 @@
hg qpop
echo "# HG changeset patch" >>.hg/patches/5.patch
echo "# User johndoe" >>.hg/patches/5.patch
-hg qpush 2>&1 | grep 'Now at'
+hg qpush 2>&1 | grep 'now at'
catlog 5
echo ==== hg qref
diff --git a/tests/test-mq-header-from.out b/tests/test-mq-header-from.out
--- a/tests/test-mq-header-from.out
+++ b/tests/test-mq-header-from.out
@@ -130,8 +130,8 @@
1: [mq]: 2.patch - jane
0: [mq]: 1.patch - mary
==== qnew with HG header
-Now at: 4.patch
-Now at: 5.patch
+now at: 4.patch
+now at: 5.patch
# HG changeset patch
# User johndoe
4: imported patch 5.patch - johndoe
@@ -183,13 +183,13 @@
1: [mq]: 2.patch - jane
0: [mq]: 1.patch - mary
==== qpop -a / qpush -a
-Patch queue now empty
+patch queue now empty
applying 1.patch
applying 2.patch
applying 3.patch
applying 4.patch
applying 5.patch
-Now at: 5.patch
+now at: 5.patch
4: imported patch 5.patch - johndeere
3: Four - jane
2: Three (again) - maria
diff --git a/tests/test-mq-merge.out b/tests/test-mq-merge.out
--- a/tests/test-mq-merge.out
+++ b/tests/test-mq-merge.out
@@ -8,9 +8,9 @@
b
merging with queue at: .hg/patches.1
applying rm_a
-Now at: rm_a
+now at: rm_a
b
-Patch queue now empty
+patch queue now empty
% init t2
adding a
@@ -21,4 +21,4 @@
merging with queue at refqueue
(working directory not at tip)
applying patcha
-Now at: patcha
+now at: patcha
diff --git a/tests/test-mq-missingfiles.out b/tests/test-mq-missingfiles.out
--- a/tests/test-mq-missingfiles.out
+++ b/tests/test-mq-missingfiles.out
@@ -1,12 +1,12 @@
adding b
-Patch queue now empty
+patch queue now empty
% push patch with missing target
applying changeb
unable to find 'b' for patching
2 out of 2 hunks FAILED -- saving rejects to file b.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
-Errors during apply, please fix and refresh changeb
+errors during apply, please fix and refresh changeb
% display added files
a
c
@@ -26,7 +26,7 @@
+c
+c
adding b
-Patch queue now empty
+patch queue now empty
% push git patch with missing target
applying changeb
unable to find 'b' for patching
@@ -35,7 +35,7 @@
b: No such file or directory
b not tracked!
patch failed, rejects left in working dir
-Errors during apply, please fix and refresh changeb
+errors during apply, please fix and refresh changeb
? b.rej
% display added files
a
@@ -49,6 +49,6 @@
% test push creating directory during git copy or rename
adding a
-Patch queue now empty
+patch queue now empty
applying patch
-Now at: patch
+now at: patch
diff --git a/tests/test-mq-pull-from-bundle.out b/tests/test-mq-pull-from-bundle.out
--- a/tests/test-mq-pull-from-bundle.out
+++ b/tests/test-mq-pull-from-bundle.out
@@ -13,7 +13,7 @@
1: main: one updated.
====== Setup queue
adding two
-Patch queue now empty
+patch queue now empty
====== Bundle queue
1 changesets found
====== Clone base
diff --git a/tests/test-mq-qclone-http.out b/tests/test-mq-qclone-http.out
--- a/tests/test-mq-qclone-http.out
+++ b/tests/test-mq-qclone-http.out
@@ -25,7 +25,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
applying b.patch
-Now at: b.patch
+now at: b.patch
imported patch b.patch
a
% test with normal collection
@@ -50,7 +50,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
applying b.patch
-Now at: b.patch
+now at: b.patch
imported patch b.patch
a
% test with old-style collection
@@ -75,6 +75,6 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
applying b.patch
-Now at: b.patch
+now at: b.patch
imported patch b.patch
a
diff --git a/tests/test-mq-qdelete.out b/tests/test-mq-qdelete.out
--- a/tests/test-mq-qdelete.out
+++ b/tests/test-mq-qdelete.out
@@ -1,14 +1,14 @@
adding base
abort: qdelete requires at least one revision or patch name
abort: cannot delete applied patch c
-Now at: b
+now at: b
a
b
a
b
series
status
-Now at: a
+now at: a
a
b
series
@@ -27,10 +27,10 @@
no patches applied
abort: revision 0 is not managed
abort: cannot delete revision 2 above applied patches
-Now at: b
+now at: b
abort: unknown revision 'c'!
applying c
-Now at: c
+now at: c
c
3 imported patch c
2 [mq]: b
diff --git a/tests/test-mq-qdiff.out b/tests/test-mq-qdiff.out
--- a/tests/test-mq-qdiff.out
+++ b/tests/test-mq-qdiff.out
@@ -26,7 +26,7 @@
+patched
% revert
% qpop
-Patch queue now empty
+patch queue now empty
% qdelete mqbase
% commit 2
adding lines
diff --git a/tests/test-mq-qgoto.out b/tests/test-mq-qgoto.out
--- a/tests/test-mq-qgoto.out
+++ b/tests/test-mq-qgoto.out
@@ -1,6 +1,6 @@
adding a
-Now at: a.patch
+now at: a.patch
applying b.patch
applying c.patch
-Now at: c.patch
-Now at: b.patch
+now at: c.patch
+now at: b.patch
diff --git a/tests/test-mq-qimport.out b/tests/test-mq-qimport.out
--- a/tests/test-mq-qimport.out
+++ b/tests/test-mq-qimport.out
@@ -6,19 +6,19 @@
% import patch that already exists
abort: patch "url.diff" already exists
applying url.diff
-Now at: url.diff
+now at: url.diff
foo
-Patch queue now empty
+patch queue now empty
% qimport -f
adding url.diff to series file
applying url.diff
-Now at: url.diff
+now at: url.diff
foo2
-Patch queue now empty
+patch queue now empty
% build diff with CRLF
adding b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% qimport CRLF diff
adding b.diff to series file
applying b.diff
-Now at: b.diff
+now at: b.diff
diff --git a/tests/test-mq-qnew.out b/tests/test-mq-qnew.out
--- a/tests/test-mq-qnew.out
+++ b/tests/test-mq-qnew.out
@@ -19,7 +19,7 @@
abort: patch "first.patch" already exists
abort: patch "first.patch" already exists
% qnew -f from a subdirectory
-Patch queue now empty
+patch queue now empty
adding d/b
M d/b
diff --git a/d/b b/d/b
diff --git a/tests/test-mq-qpush-fail.out b/tests/test-mq-qpush-fail.out
--- a/tests/test-mq-qpush-fail.out
+++ b/tests/test-mq-qpush-fail.out
@@ -1,5 +1,5 @@
adding foo
-Patch queue now empty
+patch queue now empty
applying patch1
applying patch2
applying bad-patch
diff --git a/tests/test-mq-qrefresh-replace-log-message.out b/tests/test-mq-qrefresh-replace-log-message.out
--- a/tests/test-mq-qrefresh-replace-log-message.out
+++ b/tests/test-mq-qrefresh-replace-log-message.out
@@ -1,7 +1,7 @@
=======================
Should fail if no patches applied
-No patches applied
-No patches applied
+no patches applied
+no patches applied
=======================
Should display 'First commit message'
description:
diff --git a/tests/test-mq-symlinks.out b/tests/test-mq-symlinks.out
--- a/tests/test-mq-symlinks.out
+++ b/tests/test-mq-symlinks.out
@@ -1,10 +1,10 @@
a -> a not a symlink
a -> b
-Now at: base.patch
+now at: base.patch
applying symlink.patch
-Now at: symlink.patch
+now at: symlink.patch
a -> b
-Now at: symlink.patch
+now at: symlink.patch
applying removesl.patch
-Now at: removesl.patch
+now at: removesl.patch
C b
diff --git a/tests/test-mq.out b/tests/test-mq.out
--- a/tests/test-mq.out
+++ b/tests/test-mq.out
@@ -108,28 +108,28 @@
a
+a
% qpop
-Patch queue now empty
+patch queue now empty
% qpush
applying test.patch
-Now at: test.patch
+now at: test.patch
% pop/push outside repo
-Patch queue now empty
+patch queue now empty
applying test.patch
-Now at: test.patch
+now at: test.patch
% qrefresh in subdir
% pop/push -a in subdir
-Patch queue now empty
+patch queue now empty
applying test.patch
applying test2.patch
-Now at: test2.patch
+now at: test2.patch
% qseries
test.patch
test2.patch
-Now at: test.patch
+now at: test.patch
0 A test.patch: foo bar
1 U test2.patch:
applying test2.patch
-Now at: test2.patch
+now at: test2.patch
% qapplied
test.patch
test2.patch
@@ -138,11 +138,11 @@
% qprev
test.patch
% qnext
-All patches applied
+all patches applied
% pop, qnext, qprev, qapplied
-Now at: test.patch
+now at: test.patch
test2.patch
-Only one patch applied
+only one patch applied
test.patch
% commit should fail
abort: cannot commit over an applied mq patch
@@ -155,19 +155,19 @@
test2.patch
% qpush/qpop with index
applying test2.patch
-Now at: test2.patch
-Now at: test.patch
+now at: test2.patch
+now at: test.patch
applying test1b.patch
-Now at: test1b.patch
+now at: test1b.patch
applying test2.patch
-Now at: test2.patch
-Now at: test1b.patch
-Now at: test.patch
+now at: test2.patch
+now at: test1b.patch
+now at: test.patch
applying test1b.patch
applying test2.patch
-Now at: test2.patch
+now at: test2.patch
% push should succeed
-Patch queue now empty
+patch queue now empty
pushing to ../../k
searching for changes
adding changesets
@@ -178,9 +178,9 @@
applying test.patch
applying test1b.patch
applying test2.patch
-Now at: test2.patch
+now at: test2.patch
% pops all patches and succeeds
-Patch queue now empty
+patch queue now empty
qpop -a succeeds
% does nothing and succeeds
no patches applied
@@ -190,15 +190,15 @@
qpop fails
% pushes a patch and succeeds
applying test.patch
-Now at: test.patch
+now at: test.patch
qpush succeeds
% pops a patch and succeeds
-Patch queue now empty
+patch queue now empty
qpop succeeds
% pushes up to test1b.patch and succeeds
applying test.patch
applying test1b.patch
-Now at: test1b.patch
+now at: test1b.patch
qpush test1b.patch succeeds
% does nothing and succeeds
qpush: test1b.patch is already at the top
@@ -213,12 +213,12 @@
abort: patch test2.patch is not applied
qpop test2.patch fails
% pops up to test.patch and succeeds
-Now at: test.patch
+now at: test.patch
qpop test.patch succeeds
% pushes all patches and succeeds
applying test1b.patch
applying test2.patch
-Now at: test2.patch
+now at: test2.patch
qpush -a succeeds
% does nothing and succeeds
all patches are currently applied
@@ -269,14 +269,14 @@
+f
M a
% qpush failure
-Patch queue now empty
+patch queue now empty
applying foo
applying bar
file foo already exists
1 out of 1 hunks FAILED -- saving rejects to file foo.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
-Errors during apply, please fix and refresh bar
+errors during apply, please fix and refresh bar
? foo
? foo.rej
% mq tags
@@ -284,7 +284,7 @@
1 qbase foo
2 qtip bar tip
% bad node in status
-Now at: foo
+now at: foo
changeset: 0:cb9a9f314b8b
mq status file refers to unknown node
tag: tip
@@ -308,9 +308,9 @@
diff --git a/new b/copy
copy from new
copy to copy
-Now at: new
+now at: new
applying copy
-Now at: copy
+now at: copy
diff --git a/new b/copy
copy from new
copy to copy
@@ -325,10 +325,10 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-Patch queue now empty
+patch queue now empty
(working directory not at tip)
applying bar
-Now at: bar
+now at: bar
diff --git a/bar b/bar
new file mode 100644
--- /dev/null
@@ -359,10 +359,10 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
-Patch queue now empty
+patch queue now empty
(working directory not at tip)
applying bar
-Now at: bar
+now at: bar
diff --git a/foo b/bleh
rename from foo
rename to bleh
@@ -386,16 +386,16 @@
% refresh omitting an added file
C newfile
A newfile
-Now at: bar
+now at: bar
% create a git patch
diff --git a/alexander b/alexander
% create a git binary patch
8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus
diff --git a/bucephalus b/bucephalus
% check binary patches can be popped and pushed
-Now at: addalexander
+now at: addalexander
applying addbucephalus
-Now at: addbucephalus
+now at: addbucephalus
8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus
% strip again
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -461,7 +461,7 @@
rev 0: add foo
patch repo:
rev 0: checkpoint
-Patch queue now empty
+patch queue now empty
main repo:
rev 0: add foo
patch repo:
@@ -475,13 +475,13 @@
rev 0: checkpoint
% test applying on an empty file (issue 1033)
adding a
-Patch queue now empty
+patch queue now empty
applying changea
-Now at: changea
+now at: changea
% test qpush with --force, issue1087
adding bye.txt
adding hello.txt
-Patch queue now empty
+patch queue now empty
% qpush should fail, local changes
abort: local changes found, refresh first
% apply force, should not discard changes with empty patch
@@ -489,7 +489,7 @@
patch: **** Only garbage was found in the patch input.
patch failed, unable to continue (try -v)
patch empty is empty
-Now at: empty
+now at: empty
diff -r bf5fc3f07a0a hello.txt
--- a/hello.txt
+++ b/hello.txt
@@ -512,12 +512,12 @@
summary: imported patch empty
-Patch queue now empty
+patch queue now empty
% qpush should fail, local changes
abort: local changes found, refresh first
% apply force, should discard changes in hello, but not bye
applying empty
-Now at: empty
+now at: empty
M bye.txt
diff -r ba252371dbc1 bye.txt
--- a/bye.txt
More information about the Mercurial-devel
mailing list